summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Support new auto-deploy helm chartfix-autodevops-monitoringAlessio Caiazza2017-09-201-4/+0
| | | | | | | New auto-deploy helm chart has new names in order to support Auto Monitoring. Works with, but does not require charts/charts.gitlab.io!66 See gitlab-ce#38028
* Merge branch 'add_tooltip_for_milestone_in_issues_list' into 'master'Douwe Maan2017-09-205-4/+15
|\ | | | | | | | | | | | | Add tooltip for milestone due date to issue and merge request lists Closes #18864 See merge request gitlab-org/gitlab-ce!14318
| * Add tooltip for milestone due date to issue and merge request listsVitaliy @blackst0ne Klachkov2017-09-205-4/+15
| |
* | Merge branch 'mk-clarify-moving-namespaces' into 'master'Douwe Maan2017-09-205-9/+52
|\ \ | | | | | | | | | | | | Clarify how to rename username or group path See merge request gitlab-org/gitlab-ce!13914
| * | Add changelog entrymk-clarify-moving-namespacesMichael Kozono2017-09-191-0/+5
| | |
| * | Add "Changing your username" section to docsMichael Kozono2017-09-192-4/+23
| | | | | | | | | | | | And link to it from where you change your username.
| * | Move help for renaming group path to docsMichael Kozono2017-09-192-5/+24
| | | | | | | | | | | | And expand on the help text.
* | | Merge branch 'zj-fix-seeding-big-projects' into 'master'Rémy Coutable2017-09-201-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove depreceted and big projects Closes #37507 See merge request gitlab-org/gitlab-ce!14336
| * | | Remove depreceted and big projectsZeger-Jan van de Weg2017-09-201-2/+2
|/ / /
* | | Merge branch 'rc/use-set-in-api-specs' into 'master'Grzegorz Bizon2017-09-2013-81/+90
|\ \ \ | | | | | | | | | | | | | | | | Add `test-prof` and use `set` in API specs See merge request gitlab-org/gitlab-ce!14370
| * | | Use set in some API specsrc/use-set-in-api-specsRémy Coutable2017-09-1911-81/+87
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Add test-profRémy Coutable2017-09-192-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'docs-specific-review-examples' into 'master'Jacob Schatz2017-09-201-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add specific code review guidelines See merge request gitlab-org/gitlab-ce!13206
| * \ \ \ Merge branch 'master' into 'docs-specific-review-examples'docs-specific-review-examplesClement Ho2017-08-01281-1615/+3371
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # doc/development/code_review.md
| * | | | | Add note about UX paradigmClement Ho2017-07-311-0/+2
| | | | | |
| * | | | | Add specific code review guidelinesadd-specific-review-examplesClement Ho2017-07-311-0/+8
| | | | | |
* | | | | | Merge branch 'jlh-mit-3rdparty-carveout' into 'master'Jacob Schatz2017-09-201-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update LICENSE to carve out third party licenses. See merge request gitlab-org/gitlab-ce!14374
| * | | | | | Update LICENSE to carve out third party licenses.jlh-mit-3rdparty-carveoutJamie Hurewitz2017-09-191-0/+6
| | | | | | |
* | | | | | | Merge branch 'fix/gitaly-commit-diff-rpc-encoding-error' into 'master'Robert Speicher2017-09-202-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode paths properly for Gitaly Commit{Diff,Delta} Closes gitaly#589 See merge request gitlab-org/gitlab-ce!14361
| * | | | | | | Encode paths properly for Gitaly Commit{Diff,Delta}fix/gitaly-commit-diff-rpc-encoding-errorAhmad Sherif2017-09-192-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitaly#589
* | | | | | | | Merge branch '37894-handle-if-auto-devops-domain-is-not-set' into 'master'Stan Hu2017-09-197-12/+118
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Handle if Auto DevOps domain is not set" Closes #37894 See merge request gitlab-org/gitlab-ce!14319
| * | | | | | | | Update _show.html.hamlFabio Busatto2017-09-191-0/+1
| | | | | | | | |
| * | | | | | | | Improve after code-reviewKamil Trzcinski2017-09-192-3/+3
| | | | | | | | |
| * | | | | | | | Add specs for warning message shown in Auto DevOps settings37894-handle-if-auto-devops-domain-is-not-setKamil Trzcinski2017-09-192-2/+72
| | | | | | | | |
| * | | | | | | | Add warning message if domain or cluster are not configuredbokebilly2017-09-196-12/+47
| | | | | | | | |
* | | | | | | | | Merge branch ↵Fatih Acet2017-09-194-255/+156
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37298-the-prettytime-utils-module-could-use-some-light-maintenance' into 'master' Resolve some tech debt in the prettyTime module Closes #37298 See merge request gitlab-org/gitlab-ce!14058
| * | | | | | | | | Lightly refactor prettyTime module.37298-the-prettytime-utils-module-could-use-some-light-maintenanceBryce Johnson2017-09-144-255/+156
| | | | | | | | | |
* | | | | | | | | | Merge branch 'revert-feature-highlight' into 'master'Jacob Schatz2017-09-1913-735/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert feature highlight Closes #38087 See merge request gitlab-org/gitlab-ce!14373
| * | | | | | | | | | Revert feature highlightClement Ho2017-09-1913-735/+7
| | | | | | | | | | |
* | | | | | | | | | | Merge branch ↵Stan Hu2017-09-192-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project' into 'master' Resolve "Auto DevOps banner is not shown when the repository is empty (new project)" Closes #37890 See merge request gitlab-org/gitlab-ce!14321
| * | | | | | | | | | Fix changelog37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-projectKamil Trzcinski2017-09-191-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Revert changes made to merge requests blank slateKamil Trzcinski2017-09-191-7/+6
| | | | | | | | | | |
| * | | | | | | | | | Enhance reuse in MRbikebilly2017-09-191-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Enhance reuse in MRbikebilly2017-09-191-7/+6
| | | | | | | | | | |
| * | | | | | | | | | Add new fileFabio Busatto2017-09-191-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Remove double div in MRbikebilly2017-09-191-4/+3
| | | | | | | | | | |
| * | | | | | | | | | Remove double divbikebilly2017-09-191-4/+2
| | | | | | | | | | |
| * | | | | | | | | | Add banner in missing pagesbokebilly2017-09-192-2/+8
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'reoganize-deployment-indexes' into 'master'Stan Hu2017-09-195-5/+58
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize indexes for the "deployments" table Closes #36877 See merge request gitlab-org/gitlab-ce!14348
| * | | | | | | | | | Reorganize indexes for the "deployments" tablereoganize-deployment-indexesYorick Peterse2017-09-195-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for a default scope that adds a "WHERE project_id = X" clause. This commit also includes an additional index for Environment#last_deployment, ensuring this query uses just an index scan instead of also applying a Filter. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36877
* | | | | | | | | | | Merge branch 'gitaly-prepare-cherry-pick-revert' into 'master'Rémy Coutable2017-09-197-90/+136
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare cherry-pick and revert for migration to Gitaly See merge request gitlab-org/gitlab-ce!14339
| * | | | | | | | | | | Prepare cherry-pick and revert for migration to GitalyJacob Vosmaer (GitLab)2017-09-197-90/+136
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'do-not-perform-disk-check' into 'master'Stan Hu2017-09-194-3/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not perform hard check (presence of file on storage) Closes #37945 See merge request gitlab-org/gitlab-ce!14369
| * | | | | | | | | | | Do not perform hard check (presence of file on storage)Kamil Trzcinski2017-09-194-3/+8
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead perform soft check (the column set to indicate that file does exist)
* | | | | | | | | | | Merge branch 'dz-check-schema' into 'master'Rémy Coutable2017-09-192-0/+16
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rake task to check db schema is valid Closes #37568 See merge request gitlab-org/gitlab-ce!14365
| * | | | | | | | | | | Add rake task to check db schema is validdz-check-schemaDmitriy Zaporozhets2017-09-192-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | Merge branch 'sidebar-sidebars-only-when-scroll' into 'master'Filipa Lacerda2017-09-192-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show the sidebar scroll bars if the user can scroll Closes #37972 See merge request gitlab-org/gitlab-ce!14335
| * | | | | | | | | | | | Only show the sidebar scroll bars if the user can scrollsidebar-sidebars-only-when-scrollPhil Hughes2017-09-192-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #37972
* | | | | | | | | | | | | Merge branch 'patch-2' into 'master'Grzegorz Bizon2017-09-191-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace "/" with "-" in cache key documentation See merge request gitlab-org/gitlab-ce!14034
| * | | | | | | | | | | | | Note about "/" which cannot be used in "cache:key"Marcin Zajączkowski2017-09-181-0/+2
| | | | | | | | | | | | | |