summaryrefslogtreecommitdiff
path: root/app/controllers/ci
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-09-14 14:03:02 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-09-14 14:03:02 +0200
commit1ce85dc4e2a1b162a0c30349f3594c1aab710708 (patch)
tree50f9befb4ed130ccf55d8aeb9713ccaf3920723f /app/controllers/ci
parentd0b9a6fca2e73277c8a8e64c9a5f1e7cc02f0570 (diff)
downloadgitlab-ce-1ce85dc4e2a1b162a0c30349f3594c1aab710708.tar.gz
Fix navigation and header tile
Remove redundant navigation on commits and builds page
Diffstat (limited to 'app/controllers/ci')
-rw-r--r--app/controllers/ci/builds_controller.rb2
-rw-r--r--app/controllers/ci/commits_controller.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/ci/builds_controller.rb b/app/controllers/ci/builds_controller.rb
index 9338b37e678..2bab562d6b3 100644
--- a/app/controllers/ci/builds_controller.rb
+++ b/app/controllers/ci/builds_controller.rb
@@ -7,7 +7,7 @@ module Ci
before_filter :authorize_manage_project!, except: [:status, :show, :retry, :cancel]
before_filter :authorize_manage_builds!, only: [:retry, :cancel]
before_filter :build, except: [:show]
- layout 'ci/project'
+ layout 'ci/build'
def show
if params[:id] =~ /\A\d+\Z/
diff --git a/app/controllers/ci/commits_controller.rb b/app/controllers/ci/commits_controller.rb
index f0c0ff1bc11..f79dbbe927a 100644
--- a/app/controllers/ci/commits_controller.rb
+++ b/app/controllers/ci/commits_controller.rb
@@ -6,7 +6,7 @@ module Ci
before_filter :authorize_access_project!, except: [:status, :show, :cancel]
before_filter :authorize_manage_builds!, only: [:cancel]
before_filter :commit, only: :show
- layout 'ci/project'
+ layout 'ci/commit'
def show
@builds = @commit.builds