diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-22 17:54:37 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-22 17:54:37 -0500 |
| commit | 9ef468922c2ed5a02250414576fcf98ad1ac23cb (patch) | |
| tree | 486946a24a56d38681507e7498a7fd5dfe1d5195 /app/controllers/application_controller.rb | |
| parent | 7c520c7803524de0eefb8fbcc79d4c943a80c4de (diff) | |
| parent | 3982219d98da1578d9b61bf685a7389371778eee (diff) | |
| download | gitlab-ce-9ef468922c2ed5a02250414576fcf98ad1ac23cb.tar.gz | |
Merge branch 'master' into issue_5546
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5d047f09f64..540cc30bed5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -25,6 +25,7 @@ class ApplicationController < ActionController::Base helper_method :abilities, :can?, :current_application_settings helper_method :import_sources_enabled?, :github_import_enabled?, :github_import_configured?, :gitlab_import_enabled?, :gitlab_import_configured?, :bitbucket_import_enabled?, :bitbucket_import_configured?, :gitorious_import_enabled?, :google_code_import_enabled?, :fogbugz_import_enabled?, :git_import_enabled? + helper_method :repository rescue_from Encoding::CompatibilityError do |exception| log_exception(exception) |