summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-074-13/+22
|\
| * Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-072-0/+8
| |\
| | * Fix specs; start on light themeAnnabel Dunstone Gray2017-09-061-1/+3
| | * Add blue themeAnnabel Dunstone Gray2017-09-061-0/+1
| | * Add functionality for two themesAnnabel Dunstone Gray2017-09-061-8/+4
| | * Restore some changes from !9199Rubén Dávila2017-09-062-1/+10
| * | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-072-13/+14
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-0612-34/+41
| | |\
| | * | Group boards CE backportFelipe Artur2017-08-282-13/+14
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj...Kamil Trzcinski2017-09-063-7/+24
|\ \ \ \ | |/ / /
| * | | Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-061-3/+0
| |\ \ \
| | * | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-061-3/+0
| | | |/ | | |/|
| * | | Profile updates from providersAlexander Keramidas2017-09-062-4/+24
| |/ /
* | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-064-2/+15
|\ \ \ | |/ /
| * | 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
* | | | Incorporate reviewZeger-Jan van de Weg2017-09-041-1/+1
* | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-044-1/+8
|\ \ \ \ | |/ / /
| * | | 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
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Fix testsZeger-Jan van de Weg2017-09-041-1/+1
* | | | | | | | | | | | | | Implement the implied CI/CD config for AutoDevOpsZeger-Jan van de Weg2017-08-311-1/+6
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | 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
|/ / / / / / / / / /