diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2014-11-12 13:14:13 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2014-11-12 13:14:13 +0200 |
| commit | 1a7e3476351979d37cd5fa2b7b5800717487d758 (patch) | |
| tree | 944564aabc35977b9771933ced239d46ddece10b /app/assets/javascripts/dispatcher.js.coffee | |
| parent | 8146271d4043a91e8f65c7af41c6c015e7d155c3 (diff) | |
| parent | c58edd7c708c39a6e7c60bd96c7f97ced370f304 (diff) | |
| download | gitlab-ce-1a7e3476351979d37cd5fa2b7b5800717487d758.tar.gz | |
Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequences
Conflicts:
CHANGELOG
Diffstat (limited to 'app/assets/javascripts/dispatcher.js.coffee')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index ec4b7ea42cf..fb1adbc4b3d 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -58,8 +58,6 @@ class Dispatcher when 'groups:show', 'projects:show' new Activities() shortcut_handler = new ShortcutsNavigation() - when 'projects:teams:members:index' - new TeamMembers() when 'groups:members' new GroupMembers() new UsersSelect() |