summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Document pattern for .find_or_create and similar methods.ab-docs-find-or-createAndreas Brandl2018-07-171-0/+42
|
* Merge branch 'frozen-string-enable-app-services' into 'master'Rémy Coutable2018-07-1648-13/+119
|\ | | | | | | | | Enable frozen string in apps/services/*.rb See merge request gitlab-org/gitlab-ce!20401
| * Enable frozen string in apps/uploaders/*.rbgfyoung2018-07-1648-13/+119
| | | | | | | | Partially addresses #47424.
* | Merge branch 'update-issue-closing-pattern' into 'master'Rémy Coutable2018-07-163-1/+20
|\ \ | | | | | | | | | | | | | | | | | | Update issue closing pattern Closes #49166 See merge request gitlab-org/gitlab-ce!20554
| * | Add tests for non-comma-separated issue numbers in single line messageGeorge Tsiolis2018-07-111-0/+14
| | |
| * | Update issue closing patternGeorge Tsiolis2018-07-112-1/+6
| | |
* | | Merge branch 'update-git-to-2-18-0' into 'master'Stan Hu2018-07-162-4/+4
|\ \ \ | | | | | | | | | | | | | | | | Update Git version to 2.18.0 See merge request gitlab-org/gitlab-ce!20489
| * | | Update .gitlab-ci.ymlupdate-git-to-2-18-0James Lopez2018-07-131-1/+1
| | | |
| * | | Update Git version to 2.18.0James Lopez2018-07-091-3/+3
| | | |
* | | | Merge branch 'dz-fix-com-architecture-link' into 'master'Rémy Coutable2018-07-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix invalid link to GitLab.com architecture.md See merge request gitlab-org/gitlab-ce!20645
| * | | | Fix invalid link to GitLab.com architecture.mddz-fix-com-architecture-linkDmitriy Zaporozhets2018-07-161-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'tweak-sql-buckets' into 'master'Yorick Peterse2018-07-162-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a 10 ms bucket for SQL timings See merge request gitlab-org/gitlab-ce!20527
| * | | | Add a 10 ms bucket for SQL timingstweak-sql-bucketsYorick Peterse2018-07-102-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | This allows us to calculate quantiles of SQL timings more accurately, instead of a lot of timings being assigned to the 50 ms bucket.
* | | | | Merge branch 'i18n-extract-app/views/import' into 'master'Rémy Coutable2018-07-1615-163/+381
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | i18n: externalize strings from 'app/views/import' See merge request gitlab-org/gitlab-ce!19732
| * | | | i18n: externalize strings from 'app/views/import'Tao Wang2018-07-1615-163/+381
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-07-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update 10.6-to-10.7.md See merge request gitlab-org/gitlab-ce!20610
| * | | | | Update 10.6-to-10.7.mdMateusz2018-07-131-1/+1
| | | | | |
* | | | | | Merge branch 'remove-repository-lookup' into 'master'Sean McGivern2018-07-164-270/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Remove Repository#lookup and unreachable rugged code See merge request gitlab-org/gitlab-ce!20553
| * | | | | Remove Repository#lookup and unreachable rugged codeJacob Vosmaer (GitLab)2018-07-164-270/+11
|/ / / / /
* | | | | Merge branch ↵Sean McGivern2018-07-1612-25/+244
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage' into 'master' Resolve "Project exports fail when uploads have been migrated to object storage" Closes #48745 See merge request gitlab-org/gitlab-ce!20484
| * | | | | refactor code based on feedbackJames Lopez2018-07-162-5/+5
| | | | | |
| * | | | | use fileuploader dynamic path method in uploads manager and add spec48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storageJames Lopez2018-07-134-10/+18
| | | | | |
| * | | | | fix typo in uploads managerJames Lopez2018-07-131-1/+1
| | | | | |
| * | | | | add small comment to download method in uploads managerJames Lopez2018-07-131-0/+1
| | | | | |
| * | | | | refactor uploads managerJames Lopez2018-07-131-7/+7
| | | | | |
| * | | | | update saver spec to use the old uploads codeJames Lopez2018-07-121-0/+1
| | | | | |
| * | | | | refactor uploads manager to grab uploads in batchesJames Lopez2018-07-121-6/+16
| | | | | |
| * | | | | fix uploads restorer missing pathJames Lopez2018-07-121-0/+4
| | | | | |
| * | | | | fix specJames Lopez2018-07-112-8/+16
| | | | | |
| * | | | | added changelog, small refactorJames Lopez2018-07-114-6/+6
| | | | | |
| * | | | | refactor uploads managerJames Lopez2018-07-113-8/+13
| | | | | |
| * | | | | fix uploads restorerJames Lopez2018-07-111-0/+4
| | | | | |
| * | | | | fix specsJames Lopez2018-07-114-13/+39
| | | | | |
| * | | | | add restore methodJames Lopez2018-07-112-3/+18
| | | | | |
| * | | | | update uploads saverJames Lopez2018-07-104-15/+25
| | | | | |
| * | | | | Fix avatar saver and specJames Lopez2018-07-102-5/+9
| | | | | |
| * | | | | add more object storage specsJames Lopez2018-07-102-5/+26
| | | | | |
| * | | | | add upload manager and specJames Lopez2018-07-102-0/+102
| | | | | |
* | | | | | Merge branch 'fix/gb/rename-environments-stop-actions' into 'master'Kamil Trzciński2018-07-1610-39/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it more explicit what environment stop actions are Closes #48672 See merge request gitlab-org/gitlab-ce!20587
| * | | | | | Remove unused `stop_action?` method from deployment classfix/gb/rename-environments-stop-actionsGrzegorz Bizon2018-07-122-22/+0
| | | | | | |
| * | | | | | Rename environments stop action methodGrzegorz Bizon2018-07-128-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it more explicit that an environment is not a stop action, but instead is merely contains a stop action.
* | | | | | | Merge branch 'i18n-extract-app/views/doorkeeper' into 'master'Rémy Coutable2018-07-1613-61/+163
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n: externalize strings from 'app/views/doorkeeper' See merge request gitlab-org/gitlab-ce!19695
| * | | | | | | i18n: externalize strings from 'app/views/doorkeeper'Tao Wang2018-07-1313-61/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | | | | | | Merge branch 'set-build-token-CN' into 'master'Rémy Coutable2018-07-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the CI Job trigger as the build trigger Closes charts/gitlab#586 See merge request gitlab-org/gitlab-ce!20619
| * | | | | | | | Add the CI Job trigger as the build triggerset-build-token-CNDJ Mountney2018-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For building CNG images on tag
* | | | | | | | | Merge branch 'mk/fix-flaky-protected-branch-expectations' into 'master'Rémy Coutable2018-07-165-44/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Remove flaky and redundant expectations Closes #49164 See merge request gitlab-org/gitlab-ce!20616
| * | | | | | | | | Remove flaky and redundant expectationsmk/fix-flaky-protected-branch-expectationsMichael Kozono2018-07-135-44/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jprovazn-rails-ci' into 'master'Rémy Coutable2018-07-161-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger rails5 tests if variable is set See merge request gitlab-org/gitlab-ce!20609
| * | | | | | | | | Trigger rails5 tests either by variable or ref namejprovazn-rails-ciJan Provaznik2018-07-161-1/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-allow-danger-to-fail' into 'master'Rémy Coutable2018-07-161-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Danger step to fail See merge request gitlab-org/gitlab-ce!20624