diff options
| author | Phil Hughes <me@iamphill.com> | 2017-03-07 11:40:27 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-03-07 11:40:27 +0000 |
| commit | 12fe94c388ae9ec73e34852ef7d7b90f2f347df7 (patch) | |
| tree | 5182f89deddf9428b1d6ca70720f8ac8ee2b940a /config/routes | |
| parent | 002d3a3e72de57c76a077ed5d09e857243c7effd (diff) | |
| parent | ac9d792946deb17a402646e5481087e4d92f88ad (diff) | |
| download | gitlab-ce-12fe94c388ae9ec73e34852ef7d7b90f2f347df7.tar.gz | |
Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/project.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index c56c5e14384..9bdef880a21 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -13,7 +13,6 @@ constraints(ProjectUrlConstrainer.new) do resources :autocomplete_sources, only: [] do collection do - get 'emojis' get 'members' get 'issues' get 'merge_requests' |