summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Refactor CSRF protectionblackst0ne2017-07-261-1/+1
* Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'Sean McGivern2017-07-251-0/+3
|\
| * Adds link_to_gfm method instrumentationadd-instrumentation-to-link-to-gfmTiago Botelho2017-07-251-0/+3
* | Resolve "More RESTful API: include resource URLs in responses"Oswaldo Ferreira2017-07-252-1/+36
|/
* How to Merge to external FileTim Zallmann2017-07-241-0/+1
* Merge branch '35330-fix-nginx-add-haproxy' into 'master'Tim Zallmann2017-07-241-1/+22
|\
| * Fix for HA ProxyJoshua Lambert2017-07-201-1/+1
| * Add HA Proxy metrics, fix NGINXJoshua Lambert2017-07-201-1/+22
* | Merge branch 'zj-pipeline-badge-improvements' into 'master'Grzegorz Bizon2017-07-221-1/+3
|\ \
| * | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-211-1/+3
* | | Merge branch '31031-convert-protected-branches-es6' into 'master'Filipa Lacerda2017-07-211-1/+1
|\ \ \ | |/ / |/| |
| * | Update Protected Branches bundle pathkushalpandya2017-07-191-1/+1
* | | Merge branch 'sh-lograge-iso6801-time' into 'master'Stan Hu2017-07-201-1/+1
|\ \ \ | |_|/ |/| |
| * | Standardize on ISO8601 UTC time for logragesh-lograge-iso6801-timeStan Hu2017-07-201-1/+1
* | | Merge branch 'rc/cob-backport-ce-to-ee-fix' into 'master'Robert Speicher2017-07-201-1/+1
|\ \ \
| * | | Fix logger disabling on the CI: instantiate an ActiveSupport::TaggedLoggingrc/cob-backport-ce-to-ee-fixRémy Coutable2017-07-201-1/+1
* | | | Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'Kamil Trzciński2017-07-201-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix docker tag reference routing constraintsGrzegorz Bizon2017-07-191-1/+1
* | | | Merge branch '33359-pers-snippet-files-location' into 'security-9-3'Sean McGivern2017-07-191-2/+2
| |/ / |/| |
* | | 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
View Lorry Controller Status