diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-25 19:26:55 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-25 19:26:55 +0300 |
| commit | 10a914fbf31b465ac2190730b826f7752ece7da4 (patch) | |
| tree | 1c02aa995de8ed24bce41d6fcd461c7f92a8f83c /config/application.rb | |
| parent | 5d5b97cdd692802fc38a12d958a67d73686b97ab (diff) | |
| parent | d70f7f5d25aa8753ee3fa26a7564b7d379e72c2d (diff) | |
| download | gitlab-ce-dz-codeclimate-compare.tar.gz | |
Merge remote-tracking branch 'origin/master' into dz-codeclimate-comparedz-codeclimate-compare
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 95ba6774916..b0533759252 100644 --- a/config/application.rb +++ b/config/application.rb @@ -65,6 +65,7 @@ module Gitlab hook import_url incoming_email_token + rss_token key otp_attempt password |