summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-0510-16/+40
|\
| * Merge branch 'gitaly-fetch-ref' into 'master'Sean McGivern2017-10-041-1/+3
| |\
| | * Let fetch_ref pull from Gitaly instead of from diskJacob Vosmaer2017-10-041-1/+3
| * | Load only the currently needed JS locale fileTim Zallmann2017-10-043-5/+16
| |/
| * Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-042-1/+3
| |\
| | * Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-281-2/+0
| | |\
| | * \ Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-264-3/+62
| | |\ \
| | * \ \ Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-224-9/+7
| | |\ \ \
| | * | | | Add ContainerTag and ContainerRepository frontend APIKamil Trzcinski2017-09-211-1/+1
| | * | | | [ci skip] First iteration: port haml into vueFilipa Lacerda2017-09-191-0/+2
| * | | | | Resolve "Precompiled assets with digest strings are ignored in CI"Mike Greiling2017-10-031-1/+1
| * | | | | Add grpc.log for GitalyJacob Vosmaer (GitLab)2017-10-031-0/+11
| * | | | | Merge branch 'close-issue-by-implements' into 'master'Sean McGivern2017-10-032-2/+2
| |\ \ \ \ \
| | * | | | | 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
| |/ / / / /
| * | | | | 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
* | | | must now set the devise default scope (since we now have an :email scope)Brett Walker2017-09-241-1/+1
* | | | moved devise_for :emails to live under `profiles`, removing the needBrett Walker2017-09-232-3/+3
* | | | small cleanup changes based on feedbackBrett Walker2017-09-231-1/+1
* | | | add verified/unverified labels to profile emails.Brett Walker2017-09-231-1/+5
* | | | remove unnecessary devise_scopeBrett Walker2017-09-231-2/+0
* | | | Send a confirmation email when the user adds a secondary email address. Utili...Brett Walker2017-09-231-0/+5
|/ / /
* | | 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
View Lorry Controller Status