diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-05-16 19:41:15 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-05-17 20:17:30 +0800 |
| commit | 71777a4a184945d6b58170af55d9fd9fef821ac9 (patch) | |
| tree | e3abb2579383d151ac4463b08a783ff9630e4b2c /config/routes | |
| parent | a5f0656392699dad7677a368c315217ea99b3982 (diff) | |
| download | gitlab-ce-71777a4a184945d6b58170af55d9fd9fef821ac9.tar.gz | |
Rename BuildsController to JobsController
Rename other URL generators
admin_builds_path -> admin_jobs_path
Fix tests and more renaming
Fix more tests
Also change build_id to job_id in the controller
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/admin.rb | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 48993420ed9..11e6f844de8 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -110,7 +110,7 @@ namespace :admin do resources :cohorts, only: :index - resources :builds, only: :index do + resources :jobs, only: :index do collection do post :cancel_all end diff --git a/config/routes/project.rb b/config/routes/project.rb index c786cbdee1e..0c8052558c1 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -166,7 +166,7 @@ constraints(ProjectUrlConstrainer.new) do end end - resources :builds, only: [:index, :show], constraints: { id: /\d+/ } do + resources :jobs, only: [:index, :show], constraints: { id: /\d+/ } do collection do post :cancel_all |