summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* remove extra space to fix codestylerubocop/space-around-operatorsGabriel Mazetto2016-05-131-1/+1
* Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-135-13/+13
* Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-122-2/+2
|\
| * Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-082-2/+2
* | Merge branch 'health-check-route'Douwe Maan2016-05-122-0/+8
|\ \
| * | Support token header for health check token, and general cleanup of the healt...DJ Mountney2016-05-112-2/+2
| * | Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-101-1/+3
| * | Set the standard health_check options to include the cache check.DJ Mountney2016-05-101-28/+3
| * | Add the health_check gem end expose the health_check routeDJ Mountney2016-05-102-0/+31
* | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-0/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-102-2/+2
| |\ \ \ | | |/ /
| * | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-0/+1
| | |/ | |/|
* | | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-111-18/+14
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-115-15/+22
| |\ \ \
| * | | | Code improveLong Nguyen2016-05-101-7/+8
| * | | | Routing refactoringLong Nguyen2016-05-081-13/+10
| * | | | Fix routing errorLong Nguyen2016-05-081-1/+1
| * | | | user routings refactorLong Nguyen2016-05-081-20/+17
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-0510-31/+95
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Add snippet tab under user profileLong Nguyen2016-05-021-2/+3
* | | | | Remove Rails monkey-patches now that we're using Rails 4.2.6Rémy Coutable2016-05-111-48/+0
| |_|/ / |/| | |
* | | | Fix a few places where autoloading would failRémy Coutable2016-05-103-10/+10
* | | | Add eager load paths to help prevent dependency load issues with Sidekiq workersStan Hu2016-05-101-6/+13
| |_|/ |/| |
* | | Merge branch 'rs-remove-wall_enabled' into 'master' Dmitriy Zaporozhets2016-05-091-1/+0
|\ \ \
| * | | Remove `wall_enabled` field from Projectrs-remove-wall_enabledRobert Speicher2016-05-081-1/+0
| | |/ | |/|
* | | Merge branch 'trusted-proxies-ip-addr' into 'master' Rémy Coutable2016-05-091-1/+2
|\ \ \ | |/ / |/| |
| * | Pass trusted_proxies to action_dispatch as IPAddrs instead of stringsDJ Mountney2016-04-281-1/+2
* | | Use the new admin settings for gravatarArtem Sidorenko2016-05-041-1/+0
* | | Merge branch 'add-instrumentation-for-15137' into 'master' Yorick Peterse2016-05-041-15/+22
|\ \ \
| * | | Instrument methods used in email diffsSean McGivern2016-05-041-15/+22
* | | | Revert "Remove the Devise Async gem."Connor Shea2016-05-031-0/+1
|/ / /
* | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-021-3/+3
|\ \ \
| * | | Fix issue with impersonationDouwe Maan2016-04-221-3/+3
| | |/ | |/|
* | | Fix "remember me" sign in optionJacob Vosmaer2016-05-021-1/+1
* | | Merge branch 'add-parameters' into 'master' Robert Speicher2016-04-301-1/+24
|\ \ \
| * | | Add more parameters to the filter_parameters config.Connor Shea2016-04-291-1/+24
| | |/ | |/|
* | | Merge branch 'sentry-filter' into 'master' Robert Speicher2016-04-291-0/+3
|\ \ \
| * | | Prevent Rails filtered parameters from leaking to Sentry.Connor Shea2016-04-281-0/+3
| |/ /
* | | Load the "New Branch" button asynchronouslyYorick Peterse2016-04-281-0/+1
|/ /
* | Merge branch 'allow-disabling-of-rack-attack' into 'master' Rémy Coutable2016-04-282-2/+5
|\ \
| * | Disable Rack Attack if admin disables it in config fileStan Hu2016-04-272-2/+5
* | | Merge branch 'admin-email-frequency' into 'master' Jacob Vosmaer2016-04-282-3/+3
|\ \ \
| * | | Send 'admin emails' weekly, not dailyJacob Vosmaer2016-04-262-3/+3
| | |/ | |/|
* | | Merge branch 'fix-github-enterprise-imports' into 'master' Rémy Coutable2016-04-282-0/+26
|\ \ \
| * | | Fixes for review of GitHub Enterprise backport changesStan Hu2016-04-261-3/+3
| * | | Backport GitHub Enterprise import support from EEStan Hu2016-04-262-0/+26
| | |/ | |/|
* | | Merge branch 'rs-letter_opener_web' into 'master' Dmitriy Zaporozhets2016-04-272-5/+7
|\ \ \ | |/ / |/| |
| * | Add letter_opener_web gemrs-letter_opener_webRobert Speicher2016-04-222-5/+7
| |/
* | Remove the Devise Async gem.Connor Shea2016-04-261-1/+0
|/
* Improved confirmation UXconfirmation-screenPhil Hughes2016-04-211-0/+1
View Lorry Controller Status