summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '36061-mr-ref' into 'master'Sean McGivern2017-08-281-0/+3
|\
| * Instrument MergeRequest#ensure_ref_fetched36061-mr-refJarka Kadlecova2017-08-281-0/+3
* | Merge commit '2be34630623711fc20ef8c101b5cef688f207cc1' into backstage/gb/ren...backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-261-1/+1
|\ \
| * \ Merge branch 'fix-deprecation-warning' into 'master'Clement Ho2017-08-251-1/+1
| |\ \ | | |/ | |/|
| | * fix deprecation warning present during webpack compilesMike Greiling2017-08-251-1/+1
* | | Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues'Kamil Trzciński2017-08-253-9/+2
|\ \ \ | |/ /
| * | Define ldap methods at runtimeBob Van Landuyt2017-08-241-6/+0
| * | Merge branch 'disable-webpack-optimization' into 'master'Tim Zallmann2017-08-231-0/+1
| |\ \
| | * | disable webpack.optimize.ModuleConcatenationPlugin during karma testsdisable-webpack-optimizationMike Greiling2017-08-211-0/+1
| * | | Merge branch 'zj-fix-import-gitlab-export-form' into 'master'Douwe Maan2017-08-221-3/+1
| |\ \ \
| | * | | Update form to properly set the pathZeger-Jan van de Weg2017-08-221-3/+1
* | | | | Merge branch 'master' into backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-221-4/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'zj-remove-ci-api-v1' into 'master'Kamil Trzciński2017-08-211-4/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove CI API v1Zeger-Jan van de Weg2017-08-181-4/+0
* | | | | Adjust sidekiq queues weights in queues config fileGrzegorz Bizon2017-08-211-3/+3
* | | | | Assign some CI/CD workers to pipeline default queueGrzegorz Bizon2017-08-211-1/+1
* | | | | Assign all pipeline workers to specific queuesGrzegorz Bizon2017-08-211-0/+3
* | | | | Simplify pipeline sidekiq queues naming schemeGrzegorz Bizon2017-08-211-1/+1
* | | | | Make it possible to check if worker uses a known queueGrzegorz Bizon2017-08-211-0/+1
|/ / / /
* | | | Merge branch 'fix-broken-yarn-deps' into 'master'Tim Zallmann2017-08-211-7/+2
|\ \ \ \
| * | | | remove zopfli compression temporarily until a better solution is foundMike Greiling2017-08-181-7/+2
| |/ / /
* | | | remove superfluous users bundleremove-user-bundleMike Greiling2017-08-181-1/+0
| |/ / |/| |
* | | Setup repositories settings properlymk-setup-settings-properlyMichael Kozono2017-08-171-1/+5
* | | Setup LDAP settings properlyMichael Kozono2017-08-171-0/+4
|/ /
* | Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-161-0/+20
|\ \
| * | Only create commit GPG signature when necessarydm-gpg-signature-performanceDouwe Maan2017-08-161-0/+20
* | | Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'Rémy Coutable2017-08-162-2/+5
|\ \ \
| * | | Use better higher threshold settings for storage access in testsBob Van Landuyt2017-08-161-0/+3
| * | | Allow a `failure_wait_time` of 0 for storage accessBob Van Landuyt2017-08-161-2/+2
* | | | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-161-0/+2
|\ \ \ \
| * | | | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-141-0/+2
* | | | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-164-8/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-154-8/+8
* | | | | Merge branch '36405-fix-mysql-timestamp-columns' into 'master'Stan Hu2017-08-151-0/+30
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make sure MySQL would not use CURRENT_TIMESTAMP36405-fix-mysql-timestamp-columnsLin Jen-Shin2017-08-151-0/+30
| | |_|/ | |/| |
* | | | Merge branch '36152-enable-scope-hoisting-with-webpack' into 'master'Jacob Schatz2017-08-151-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | enable webpack scope hoistingMike Greiling2017-08-151-0/+3
| | |/ | |/|
* | | Improve Prometheus docs, include nginx ingressJoshua Lambert2017-08-141-4/+34
| |/ |/|
* | Make sure uploads for personal snippets are correctly renderedBob Van Landuyt2017-08-111-2/+2
|/
* alternative route for download archivehaseeb2017-08-101-0/+3
* Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-091-1/+1
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-082-3/+3
* Merge branch 'master' into ideMike Greiling2017-08-077-7/+47
|\
| * Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-0/+4
| |\
| | * Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-0/+4
| * | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-071-0/+2
| |\ \
| | * | Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-071-0/+2
| * | | Merge branch '33902-upgrade-to-webpack-v3' into 'master'Jacob Schatz2017-08-072-7/+20
| |\ \ \
| | * | | add thunky to approved licenses (MIT)Mike Greiling2017-08-071-0/+6
| | * | | add disableHostCheck to devServer config since webpack dev server is proxiedMike Greiling2017-08-071-0/+1