summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
* | | | | Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski2016-04-132-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Documentation of featurePatricio Cano2016-04-111-0/+7
| * | | | Allow `external_providers` for Omniauth to be defined to mark these users as ...Patricio Cano2016-04-111-0/+1
* | | | | Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-132-0/+6
|\ \ \ \ \
| * | | | | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-122-0/+6
| | |/ / / | |/| | |
* | | | | Add changelog entries, install docs, and gitlab.yml.example entry for the tru...DJ Mountney2016-04-121-0/+9
* | | | | Adjust the default trusted_proxies to only include localhost, and allow other...DJ Mountney2016-04-122-0/+3
* | | | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-121-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Simplify Projects::NotificationSettingsControllerDouglas Barbosa Alexandre2016-04-121-1/+1
| * | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-117-10/+13
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Use singular resource for NotificationSettingDouglas Barbosa Alexandre2016-04-081-2/+2
| * | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-085-9/+14
| |\ \ \ \
| * | | | | Change how notification settings in profile are rendered and updatedDmitriy Zaporozhets2016-03-301-0/+1
| * | | | | Create NotificationSettings object only when user change value in dropdownDmitriy Zaporozhets2016-03-301-0/+1