diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:26:29 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:26:29 +0100 |
| commit | 6c94a44295eec5efff87102fecffc2ac03ee560d (patch) | |
| tree | 5206e11ab9e08f1910256af3693654912170602b /config/routes.rb | |
| parent | 5beacba038c097e513b46f24ee26d5065ad419c9 (diff) | |
| parent | e616739e2fae12e5358d2cea40089a51468d9b4a (diff) | |
| download | gitlab-ce-6c94a44295eec5efff87102fecffc2ac03ee560d.tar.gz | |
Merge branch 'master' into mr-builds
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# app/views/projects/merge_requests/widget/_heading.html.haml
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 38f0b16a412..359cd08e134 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -500,6 +500,7 @@ Rails.application.routes.draw do member do get :commits get :ci + get :languages end end |