diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-07-01 17:34:00 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-07-01 17:34:00 +0800 |
| commit | 08070c76952a27e4710fb9f2c800e71a84fc72c7 (patch) | |
| tree | 3a89d90ff9a982afb502400561a6450e570fa74d /config/initializers/rack_attack.rb.example | |
| parent | 63477fd27f3eeff5d5f612b27ed71c76926934d2 (diff) | |
| parent | ab81ea1e8177742a0dfed2c7cf922bb03a8b6c51 (diff) | |
| download | gitlab-ce-08070c76952a27e4710fb9f2c800e71a84fc72c7.tar.gz | |
Merge remote-tracking branch 'upstream/master' into enable-shared-runners-with-admins
* upstream/master: (120 commits)
Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9.
Remove additional entries from CHANGELOG
Catch permission denied errors and ignore the disk
Remove coveralls lines
Make GH one-off auth the default again for importing GH projects
Import from Github using Personal Access Tokens.
Remove hardcoded gitlab-shell version in test env now that the required tag is published
Updated breakpoint for sidebar pinning
Expire branch/tag git data when needed.
Remove unnecessary parens
Enable Style/UnneededCapitalW Rubocop cop
Expiry date on pinned nav cookie
Fix broken spec in git_push_service_spec by stubbing an external issue tracker
Handle external issues in IssueReferenceFilter
Move Changelog entry for build retry fix to 8.9.4
Add Changelog entry for build sidebar retry link fix
Improve method that tells if build is retryable
Do not show build retry link when build is active
Remove coveralls as its unused
Move changelot item "Add sub nav to file page view" to 8.9.4
...
Diffstat (limited to 'config/initializers/rack_attack.rb.example')
| -rw-r--r-- | config/initializers/rack_attack.rb.example | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/rack_attack.rb.example b/config/initializers/rack_attack.rb.example index 30d05f16153..69052c029f2 100644 --- a/config/initializers/rack_attack.rb.example +++ b/config/initializers/rack_attack.rb.example @@ -10,7 +10,8 @@ paths_to_be_protected = [ "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session", "#{Rails.application.config.relative_url_root}/users", "#{Rails.application.config.relative_url_root}/users/confirmation", - "#{Rails.application.config.relative_url_root}/unsubscribes/" + "#{Rails.application.config.relative_url_root}/unsubscribes/", + "#{Rails.application.config.relative_url_root}/import/github/personal_access_token" ] |