summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Move new nav into main CSS folderAnnabel Dunstone Gray2017-09-251-2/+0
* Remove Grit settings from default settingssh-remove-additional-grit-settingsStan Hu2017-09-231-3/+1
* Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-223-0/+61
* Removed two legacy config optionsvoogsgerd/gitlab-ce-daniel-legacy-configDaniel Voogsgerd2017-09-211-6/+0
* Stop using Sidekiq for updating Key#last_used_atremove-use-key-workerYorick Peterse2017-09-201-1/+0
* Merge branch 'fix-rails-migrations-for-partial-indexes' into 'master'Yorick Peterse2017-09-191-1/+1
|\
| * Fix regular expression used for opclasses to not be confused by partial index...fix-rails-migrations-for-partial-indexesGreg Stark2017-09-191-1/+1
* | Detect n+1 issues involving GitalyAndrew Newdigate2017-09-191-1/+6
|/
* Merge branch '37789-followup-for-read-registry-change' into 'master'Rémy Coutable2017-09-181-1/+1
|\
| * Clean up read_registry scope changesRobin Bobbitt2017-09-181-1/+1
* | Merge branch 'fix-dev-ssl' into 'master'Grzegorz Bizon2017-09-181-1/+1
|\ \
| * | Never connect to webpack-dev-server over SSLfix-dev-sslAlessio Caiazza2017-09-151-1/+1
| |/
* | add dependency approvals (all MIT license)Mike Greiling2017-09-161-0/+36
|/
* Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-112-0/+8
* Merge branch 'sh-filter-runner-token' into 'master'Robert Speicher2017-09-111-2/+2
|\
| * Expand filtered parameters to include `token`sh-filter-runner-tokenStan Hu2017-09-101-2/+2
* | Merge branch '37644-update-prometheus-metric-library-to-support-multiple-seri...Tim Zallmann2017-09-111-10/+38
|\ \
| * | Fix ingress queryJoshua Lambert2017-09-091-2/+3
| * | Update k8s metrics and docsJoshua Lambert2017-09-081-1/+1
| * | Update queries for colors and seriesJoshua Lambert2017-09-081-10/+37
* | | Read import sources from setting at first initializationVisay Keo2017-09-091-1/+1
| |/ |/|
* | Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-082-8/+0
|/
* 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
| | |\ \ \ \