summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'authentiq-updates' into 'master'Rémy Coutable2017-07-191-3/+3
|\
| * Added authentiq provider to tests and updated documentation, gem and config f...Alexandros Keramidas2017-07-181-3/+3
* | Merge branch 'bvl-free-system-namespace' into 'master'Sean McGivern2017-07-191-2/+2
|\ \
| * | Move system-uploads to `-/system`Bob Van Landuyt2017-07-181-2/+2
* | | Update Prometheus gem to version that explicitly calls `munmap`Paweł Chojnacki2017-07-192-5/+12
* | | Merge branch 'rc/bump-peek-performance_bar' into 'master'Sean McGivern2017-07-191-4/+0
|\ \ \
| * | | Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patchrc/bump-peek-performance_barRémy Coutable2017-07-181-4/+0
| |/ /
* | | Merge branch 'sh-structured-logging' into 'master'Sean McGivern2017-07-191-0/+21
|\ \ \
| * | | Add structured logging for Rails processessh-structured-loggingStan Hu2017-07-181-0/+21
| |/ /
* | | Merge branch 'rs-disable-test-log-in-ci' into 'master'Rémy Coutable2017-07-181-0/+5
|\ \ \ | |/ / |/| |
| * | Disable Rails logging in CI test environmentsrs-disable-test-log-in-ciRobert Speicher2017-07-181-0/+5
* | | Merge branch '34831-remove-coffee-rails-gem' into 'master'Jacob Schatz2017-07-171-1/+0
|\ \ \
| * | | Remove .coffee ext files for i18nTakuya Noguchi2017-07-081-1/+0
* | | | Fix incorrect AWS ELB metrics.35174-fix-aws-elb-queryJoshua Lambert2017-07-171-1/+1
* | | | Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-141-1/+1
|\ \ \ \
| * | | | Rename ConnectionRackMiddleware to RequestsRackMiddleware.bjk/metric_namesPawel Chojnacki2017-07-131-1/+1
| | |/ / | |/| |
* | | | Refactor user bundleMike Greiling2017-07-141-1/+1
* | | | Instrument Abilityinstrument-abilitySean McGivern2017-07-141-0/+4
* | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-131-1/+1
* | | | Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'Yorick Peterse2017-07-112-0/+2
|\ \ \ \
| * | | | Disabled prepared statements in testsh-disabled-prepared-statements-in-testStan Hu2017-07-102-0/+2
* | | | | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-113-6/+12
|\ \ \ \ \
| * | | | | Merge prometheus unicorn sampler settigns within monitoring settingsPawel Chojnacki2017-07-053-11/+4
| * | | | | Add spaces between test phasesPawel Chojnacki2017-07-051-1/+1
| * | | | | correctly handle transforming settings into useful datastructurePawel Chojnacki2017-07-051-1/+0
| * | | | | Bring back healthcheck token access to monitoring resources, but mark this as...Pawel Chojnacki2017-07-051-1/+2
| * | | | | Remove the need to use health check tokenPawel Chojnacki2017-07-052-0/+13
* | | | | | Support multiple Redis instances based on queue typePaul Charlton2017-07-1110-23/+272
| |/ / / / |/| | | |
* | | | | Merge branch 'master' into 'catch-redis-address-error'DJ Mountney2017-07-1016-68/+254
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"Marin Jankovski2017-07-101-6/+0
| * | | | Re-add Feature.register_feature_groups which is already documentedRémy Coutable2017-07-101-0/+2
| | |_|/ | |/| |
| * | | Merge branch 'feature/user-datetime-search-api-mysql' into 'master'Douwe Maan2017-07-071-1/+2
| |\ \ \
| | * | | move CreatedAtFilter to concerns folderJames Lopez2017-07-071-1/+2
| | | |/ | | |/|
| * | | Merge branch '20628-add-oauth-implicit-grant' into 'master'Douwe Maan2017-07-071-3/+1
| |\ \ \
| | * | | #20628 Enable implicit flow in Gitlab as OAuth ProviderMateusz Pytel2017-07-071-3/+1
| * | | | Merge branch 'dm-fix-project-path-helpers-production' into 'master'Douwe Maan2017-07-071-10/+4
| |\ \ \ \
| | * | | | Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-productionDouwe Maan2017-07-071-10/+4
| * | | | | Merge branch '34737-authentiq-oauth-feature-spec' into 'master'Douwe Maan2017-07-071-1/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Test logging in via the Authentiq OAuth provider in a feature spec.34737-authentiq-oauth-feature-specTimothy Andrew2017-07-071-1/+4
| | | |/ / | | |/| |
| * | | | Native group milestonesFelipe Artur2017-07-071-1/+1
| * | | | Resolve "Inconsistent location of members page between groups and projects"Tim Zallmann2017-07-071-1/+1
| * | | | Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'Kamil Trzciński2017-07-071-0/+8
| |\ \ \ \
| | * | | | Wrap additional routes by dash(-). And remove those routes from path_regex.rb.Shinya Maeda2017-07-071-4/+6
| | * | | | Basic BE changeShinya Maeda2017-07-071-0/+6
| | |/ / /
| * | | | Merge branch 'gitaly-mandatory' into 'master'Sean McGivern2017-07-073-10/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove option to disable Gitaly completelyJacob Vosmaer2017-07-073-10/+3
| * | | | Merge branch 'fix-routes-in-production-mode' into 'master'Douwe Maan2017-07-061-1/+5
| |\ \ \ \
| | * | | | Fix shorter route helpers in production environmentfix-routes-in-production-modeSean McGivern2017-07-061-1/+5
| | |/ / /
| * | | | Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-062-2/+2
View Lorry Controller Status