summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'close-issue-by-implements' into 'master'Sean McGivern2017-10-032-2/+2
|\ | | | | | | | | | | | | Add "implements" to the default issue closing message regex Closes #38424 See merge request gitlab-org/gitlab-ce!14612
| * Add "implements" to the default issue closing message regexGuilherme Vieira2017-10-022-2/+2
| |
* | Add `:email_confirmation` to devise `insensitive_keys`robdel122017-09-301-1/+1
|/ | | | | | | This fixes a bug where the email confirmation input value is case sensative. For example, if the email input is `myemail@example.com` and the email confirmation input is `Myemail@example.com` the form would fail to submit.
* Add support to migrate existing projects to Hashed Storage asynchashed-storage-migration-pathGabriel Mazetto2017-09-281-0/+2
|
* 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
| | | | | This is a follow-up to https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1956 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7308.
* 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
| | | | | Removed the max_size and timeout options from the git config in gitlab.yml.
* Stop using Sidekiq for updating Key#last_used_atremove-use-key-workerYorick Peterse2017-09-201-1/+0
| | | | | | | | | | | | | | | This makes things simpler as no scheduling is involved. Further we remove the need for running a SELECT + UPDATE just to get the key and update it, whereas we only need an UPDATE when setting last_used_at directly in a request. The added service class takes care of updating Key#last_used_at without using Sidekiq. Further it makes sure we only try to obtain a Redis lease if we're confident that we actually need to do so, instead of always obtaining it. We also make sure to _only_ update last_used_at instead of also updating updated_at. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36663
* 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 clause See merge request gitlab-org/gitlab-ce!14343
| * Fix regular expression used for opclasses to not be confused by partial ↵fix-rails-migrations-for-partial-indexesGreg Stark2017-09-191-1/+1
| | | | | | | | index clause
* | 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 changes Closes #37789 See merge request gitlab-org/gitlab-ce!14307
| * Clean up read_registry scope changesRobin Bobbitt2017-09-181-1/+1
| | | | | | | | Closes #37789
* | Merge branch 'fix-dev-ssl' into 'master'Grzegorz Bizon2017-09-181-1/+1
|\ \ | | | | | | | | | | | | Never connect to webpack-dev-server over SSL in dev mode See merge request gitlab-org/gitlab-ce!14297
| * | 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
| | | This reverts merge request !14148
* Merge branch 'sh-filter-runner-token' into 'master'Robert Speicher2017-09-111-2/+2
|\ | | | | | | | | Expand filtered parameters to include `token` See merge request !14174
| * Expand filtered parameters to include `token`sh-filter-runner-tokenStan Hu2017-09-101-2/+2
| | | | | | | | | | Now that we are logging API requests in `api_json.log`, we see that the runner token was not filtered properly.
* | Merge branch ↵Tim Zallmann2017-09-111-10/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '37644-update-prometheus-metric-library-to-support-multiple-series-and-colors' into 'master' Update Prometheus Metric Library to support multiple series and colors Closes #37644 See merge request !14155
| * | 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 ↵revert-f2421b2bRubén Dávila2017-09-082-8/+0
|/ | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-09-074-13/+22
|\ | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * Merge branch ↵Sean McGivern2017-09-072-0/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
| | * 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
| |\ \ | | |/ | |/| | | | | | | Group boards CE backport See merge request !13883
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-09-0612-34/+41
| | |\ | | | | | | | | | | | | ee_issue_928_backport
| | * | Group boards CE backportFelipe Artur2017-08-282-13/+14
| | | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2017-09-063-7/+24
|\ \ \ \ | |/ / / | | | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * | | Merge branch ↵Douwe Maan2017-09-061-3/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34509-improves-markdown-rendering-performance-for-commits-list' into 'master' Resolve "Projects::CommitsController#show is slow partially due to SQL queries" Closes #34509 See merge request !13762
| | * | | 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" list See merge request !14029
| | * | 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
| |/ / | | | | | | | | | There are peaks of IO-wait time, most of them stay below 30 seconds.
| * | Merge branch '34261-move-move-to-sidebar' into 'master'Grzegorz Bizon2017-09-041-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Move "Move issue" to sidebar Closes #34261 See merge request !13616
| | * | Move "Move to different project" to sidebar34261-move-move-to-sidebarEric Eastwood2017-09-031-0/+1
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261
| * | | Merge branch 'approve-unlicense' into 'master'Douwe Maan2017-09-041-0/+6
| |\ \ \ | | |/ / | |/| | | | | | | | | | Approve the Unlicense See merge request !14001
| | * | 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
|\ \ \ \ | |/ / /
View Lorry Controller Status