diff options
| author | Andrew8xx8 <avk@8xx8.ru> | 2013-03-24 19:12:28 +0400 |
|---|---|---|
| committer | Andrew8xx8 <avk@8xx8.ru> | 2013-03-24 19:12:28 +0400 |
| commit | 7d2fbe6bd880b001857a373500e4fae31d43060a (patch) | |
| tree | dc4789ae249951407ad349ab8a3ceacfcf0e866c /app | |
| parent | 617239000762a01c57b35cbb699f155622ae921a (diff) | |
| download | gitlab-ce-7d2fbe6bd880b001857a373500e4fae31d43060a.tar.gz | |
Project Snippets now part of project
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/projects/snippets_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/tab_helper.rb | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index 49e514a228e..86e4a7cbd6b 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -1,3 +1,4 @@ class Projects::ApplicationController < ApplicationController - + before_filter :project + before_filter :repository end diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index 7c3281084f7..4602fbb989a 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -14,6 +14,8 @@ class Projects::SnippetsController < Projects::ApplicationController # Allow destroy snippet before_filter :authorize_admin_snippet!, only: [:destroy] + layout 'project_resource' + respond_to :html def index diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb index d2be4b1a7e6..19aba0f5f6d 100644 --- a/app/helpers/tab_helper.rb +++ b/app/helpers/tab_helper.rb @@ -73,7 +73,7 @@ module TabHelper end def project_tab_class - return "active" if current_page?(controller: "projects", action: :edit, id: @project) + return "active" if current_page?(controller: "/projects", action: :edit, id: @project) if ['services', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name "active" |