diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-14 19:56:19 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-14 19:57:43 -0600 |
| commit | 83f5379a15e8e15720488e78898aa2b7c3414c06 (patch) | |
| tree | d5ea11ec3a1d59b19bd729ebee95439ff3bdae8c | |
| parent | b5ec008c240e0a45f911730fc2c593f176a69203 (diff) | |
| download | gitlab-ce-23637-title-bar-pipelines.tar.gz | |
Remove builds from commit_controller23637-title-bar-pipelines
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/23637-title-bar-pipelines.yml | 6 | ||||
| -rw-r--r-- | config/routes/project.rb | 1 |
3 files changed, 5 insertions, 10 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index cdfc1ba7b92..c192d5f1dca 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -11,10 +11,9 @@ class Projects::CommitController < Projects::ApplicationController before_action :authorize_download_code!, except: [:cancel_builds, :retry_builds] before_action :authorize_update_build!, only: [:cancel_builds, :retry_builds] before_action :authorize_read_pipeline!, only: [:pipelines] - before_action :authorize_read_commit_status!, only: [:builds] before_action :commit - before_action :define_commit_vars, only: [:show, :diff_for_path, :builds, :pipelines] - before_action :define_status_vars, only: [:show, :builds, :pipelines] + before_action :define_commit_vars, only: [:show, :diff_for_path, :pipelines] + before_action :define_status_vars, only: [:show, :pipelines] before_action :define_note_vars, only: [:show, :diff_for_path] before_action :authorize_edit_tree!, only: [:revert, :cherry_pick] @@ -35,9 +34,6 @@ class Projects::CommitController < Projects::ApplicationController def pipelines end - def builds - end - def cancel_builds ci_builds.running_or_pending.each(&:cancel) diff --git a/changelogs/unreleased/23637-title-bar-pipelines.yml b/changelogs/unreleased/23637-title-bar-pipelines.yml index 4dfd9e8cfb9..3d4cf88c54c 100644 --- a/changelogs/unreleased/23637-title-bar-pipelines.yml +++ b/changelogs/unreleased/23637-title-bar-pipelines.yml @@ -1,4 +1,4 @@ --- -title: 23637-title-bar-pipelines -merge_request: -author: +title: Redesign pipelines page +merge_request: +author: diff --git a/config/routes/project.rb b/config/routes/project.rb index 82defb0ba71..9ea8adeddb8 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -33,7 +33,6 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: resources :commit, only: [:show], constraints: { id: /\h{7,40}/ } do member do get :branches - get :builds get :pipelines post :cancel_builds post :retry_builds |