summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge branch 'instrument-service-classes' into 'master' Rémy Coutable2016-04-121-0/+12
|\ \ \ \ \
| * | | | | Instrument all service classesinstrument-service-classesYorick Peterse2016-04-121-0/+12
| | |_|_|/ | |/| | |
* | | | | Un-instrument Banzai::ReferenceExtractoruninstrument-banzai-reference-extractorYorick Peterse2016-04-121-3/+0
|/ / / /
* | | | Instrument Banzai codeYorick Peterse2016-04-111-0/+23
| |_|/ |/| |
* | | Enable asset compression in production.connorshea2016-04-091-0/+3
* | | Merge branch 'rs-update-rails' into 'master' Robert Speicher2016-04-091-0/+1
|\ \ \
| * | | Bump rails to 4.2.6rs-update-railsRobert Speicher2016-04-051-0/+1
* | | | Merge branch 'redis-connection-pool' into 'master' Robert Speicher2016-04-084-10/+8
|\ \ \ \
| * | | | Put CACHE_NAMESPACE in the Gitlab::Redis moduleJacob Vosmaer2016-04-071-3/+1
| * | | | Add Gitlab::Redis connection poolJacob Vosmaer2016-04-044-7/+7
| |/ / /
* | | | Instrument Rails cache codeinstrument-rails-cacheYorick Peterse2016-04-081-0/+1
| |_|/ |/| |
* | | Remove dumb debug statement and add many tests.Jacob Schatz2016-04-072-2/+1
* | | Add optional colon.Jacob Schatz2016-04-071-1/+2
* | | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-071-3/+4
|\ \ \
| * | | Add project badges view prototypeGrzegorz Bizon2016-04-061-1/+1
| * | | Improve routes for project badgesGrzegorz Bizon2016-04-061-3/+4
* | | | Merge branch 'saml-external-groups' into 'master' Robert Speicher2016-04-071-0/+3
|\ \ \ \
| * | | | Added documentationPatricio Cano2016-04-061-0/+1
| * | | | Config examplesPatricio Cano2016-04-041-0/+2
| | |/ / | |/| |
* | | | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-071-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Add specific markdown_preview route for WikisGabriel Mazetto2016-03-301-0/+1
| | |/ | |/|
* | | Premailer shouldn't remove script tags from our emailsRobert Speicher2016-04-051-1/+2
| |/ |/|
* | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-1/+0
* | Improve and finish the fallback to the In-Reply-To and References header for ...2364-fallback-to-in-reply-to-headerRémy Coutable2016-03-252-2/+2
|/
* Merge branch 'rs-rails-routes' into 'master' Douwe Maan2016-03-231-0/+12
|\
| * Add special cases for built-in Rails routes in developmentRobert Speicher2016-03-221-0/+12
* | Fix an issue causing the Dashboard/Milestones page to be blankRémy Coutable2016-03-231-2/+1
|/
* Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-212-0/+8
|\
| * Merge branch 'backport-ee-premailer' into 'master' Rémy Coutable2016-03-212-0/+8
| |\
| | * Inline mailer CSS using premailer.Douwe Maan2016-03-192-0/+8
* | | Soft delete issuablesZeger-Jan van de Weg2016-03-191-2/+2
|/ /
* | Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-1814-89/+366
|\ \ | |/
View Lorry Controller Status