summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Move `common_vue` into vendor bundlekushalpandya2017-09-051-1/+1
* Merge branch 'forbid-fb-bsd-patents' into 'master'Douwe Maan2017-09-041-0/+6
|\
| * Add Facebook BSD+PATENTS license to the "unacceptable" listNick Thomas2017-09-041-0/+6
* | Increase the timeout before aborting a storage access attemptbvl-increase-storage-check-timeoutBob Van Landuyt2017-09-041-1/+1
|/
* Merge branch '34261-move-move-to-sidebar' into 'master'Grzegorz Bizon2017-09-041-0/+1
|\
| * Move "Move to different project" to sidebar34261-move-move-to-sidebarEric Eastwood2017-09-031-0/+1
* | Merge branch 'approve-unlicense' into 'master'Douwe Maan2017-09-041-0/+6
|\ \ | |/ |/|
| * Approve the UnlicenseNick Thomas2017-09-011-0/+6
* | Merge branch 'issue-discussions-refactor' into 'master'Jacob Schatz2017-09-022-0/+3
|\ \ | |/ |/|
| * Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-315-31/+14
| |\
| * \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-306-7/+12
| |\ \
| * \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-235-16/+13
| |\ \ \
| * \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-1712-16/+104
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-104-4/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-089-9/+119
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-071-1/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-042-3/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-012-2/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-07-3118-37/+187
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add full JSON endpoints for issue notes and discussionsDouwe Maan2017-07-211-0/+1
| * | | | | | | | | | | Notes bundle for the issue discussions refactor.Fatih Acet2017-07-211-0/+2
* | | | | | | | | | | | Merge branch 'bvl-validate-po-files' into 'master'Douwe Maan2017-09-011-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Ignore fuzzy translationsBob Van Landuyt2017-08-311-1/+4
* | | | | | | | | | | | | Merge branch '36061-mr-ref-instrument' into 'master'Sean McGivern2017-09-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Instrument MergeRequest#fetch_ref36061-mr-ref-instrumentJarka Kadlecova2017-09-011-0/+1
* | | | | | | | | | | | | Merge branch 'sh-filter-csrf-params' into 'master'Robert Speicher2017-08-311-11/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Filter additional secrets from Rails logsStan Hu2017-08-301-11/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | `current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern2017-08-312-5/+3
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mk-default-ldap-verify-certificates-secure' into 'master'Douwe Maan2017-08-312-15/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Default LDAP config verify_certificates to trueMichael Kozono2017-08-302-15/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Add filter by my reactionHiroyuki Sato2017-08-301-0/+1
* | | | | | | | | | | Update Prometheus Client MMAP gem to version that fixes performance degradati...pawel/bump_prometheus_client_mmap_version_to_fix_performance_degradationPawel Chojnacki2017-08-291-0/+3
|/ / / / / / / / / /
* | | | | | | | | | 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