Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker
Conflicts: Gemfile.lock
This commit is contained in:
commit
e1f77b9be0
20 changed files with 299 additions and 14 deletions
|
@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
|
|||
before_filter :add_abilities
|
||||
before_filter :dev_tools if Rails.env == 'development'
|
||||
before_filter :default_headers
|
||||
before_filter :add_gon_variables
|
||||
|
||||
protect_from_forgery
|
||||
|
||||
|
@ -148,4 +149,8 @@ class ApplicationController < ActionController::Base
|
|||
headers['X-Frame-Options'] = 'DENY'
|
||||
headers['X-XSS-Protection'] = '1; mode=block'
|
||||
end
|
||||
|
||||
def add_gon_variables
|
||||
gon.default_issues_tracker = Project.issues_tracker.default_value
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue