summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-114-61/+20
|\
| * 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 'master' into awardablesZeger-Jan van de Weg2016-05-1112-32/+103
|\ \ | |/
| * 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
| * Instrument Gitlab::GitAccess/GitAccessWikiYorick Peterse2016-04-211-0/+4
| * Switch raw trace to use X-Sendfile headerTomasz Maczukin2016-04-191-1/+1
| * Add raw trace output for GitLab WorkhorseTomasz Maczukin2016-04-191-0/+1
| * Add support to cherry-pick any commitP.S.V.R2016-04-181-0/+1
* | Create table for award emojiZeger-Jan van de Weg2016-05-062-4/+7
|/
* Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master' Rémy Coutable2016-04-151-1/+1
|\
| * Make /profile/keys/new redirects to /profile/keys for back-compatRémy Coutable2016-04-151-1/+1
* | Merge branch 'auto-fsck' into 'master' Robert Speicher2016-04-143-1/+15
|\ \ | |/ |/|
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-134-0/+28
| |\
| * | Clear repository check columns asynchronouslyJacob Vosmaer2016-04-131-1/+1
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-128-9/+50
| |\ \
| * | | Move 'clear checks' button to applicatoin settingsJacob Vosmaer2016-04-121-4/+1
| * | | Rename almost all the thingsJacob Vosmaer2016-04-063-6/+6
| * | | Rebase repo check MRJacob Vosmaer2016-04-043-1/+18
* | | | Merge branch 'redis_config_consistency' into 'master' Valery Sizov2016-04-132-5/+3
|\ \ \ \
| * | | | Redis configuration consistencyredis_config_consistencyValery Sizov2016-04-132-5/+3
* | | | | Merge branch 'async-related-mrs' into 'master' Rémy Coutable2016-04-131-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Load related MRs/branches asynchronouslyYorick Peterse2016-04-131-0/+2
View Lorry Controller Status