scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1462 from biosistemika/SCI-2928-turbolinks-bug

Browse source 
SCI-2928 moving team modal js file to application.js.erb in order to …
This commit is contained in:
Miha Mencin 2019-01-25 11:54:14 +01:00 committed by GitHub
parent b85386802c 126a031498
commit b67cee2e65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/application.js.erb
View file

@ -35,6 +35,7 @@
//= require underscore //= require underscore
//= require i18n.js //= require i18n.js
//= require i18n/translations //= require i18n/translations
//= require users/settings/teams/invite_users_modal
//= require turbolinks //= require turbolinks

1
app/views/users/settings/teams/show.html.erb
View file

@ -137,5 +137,4 @@
<%= render partial: 'users/settings/user_teams/destroy_user_team_modal.html.erb' %> <%= render partial: 'users/settings/user_teams/destroy_user_team_modal.html.erb' %>
<%= stylesheet_link_tag 'datatables' %> <%= stylesheet_link_tag 'datatables' %>
<%= javascript_include_tag 'users/settings/teams/show' %> <%= javascript_include_tag 'users/settings/teams/show' %>
<%= javascript_include_tag 'users/settings/teams/invite_users_modal' %>
<span data-hook="team-bottom"></span> <span data-hook="team-bottom"></span>