diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
| commit | 95f9d6d83bcb7a9f45601f828c34301e536fc195 (patch) | |
| tree | ed5447c85eb35ac9b7a363dd5a83514578c2fb3e /config/routes/project.rb | |
| parent | c92881c394a482bdb6d3f0f0a5f3cc95d5eed1fc (diff) | |
| parent | 6fe736f2c927340ed8cf827080db781f7c8adcdf (diff) | |
| download | gitlab-ce-95f9d6d83bcb7a9f45601f828c34301e536fc195.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# app/controllers/concerns/notes_actions.rb
# spec/features/task_lists_spec.rb
# spec/support/features/issuable_slash_commands_shared_examples.rb
Diffstat (limited to 'config/routes/project.rb')
| -rw-r--r-- | config/routes/project.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index d6fb309de8e..c703a7294ed 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -380,7 +380,9 @@ constraints(ProjectUrlConstrainer.new) do collection do scope '*ref', constraints: { ref: Gitlab::PathRegex.git_reference_regex } do constraints format: /svg/ do - get :build + # Keep around until 10.0, see gitlab-org/gitlab-ce#35307 + get :build, to: "badges#pipeline" + get :pipeline get :coverage end end |