Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve danger/specs/Dangerfile by not requiring new specs if specific ↵move-danger-to-test-stage | Rémy Coutable | 2018-07-17 | 1 | -4/+10 |
| | | | | | | labels are applied Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Improve danger/changelog/Dangerfile to include the title in the ↵ | Rémy Coutable | 2018-07-17 | 1 | -7/+7 |
| | | | | | | bin/changelog command Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Move the 'danger-review' job to the test stage and allow it to fail | Rémy Coutable | 2018-07-17 | 1 | -19/+21 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch 'fix-project-api-archived' into 'master' | Rémy Coutable | 2018-07-16 | 5 | -3/+48 |
|\ | | | | | | | | | | | | | Fix archived parameter for projects API Closes #32301 See merge request gitlab-org/gitlab-ce!20566 | ||||
| * | Fix archived parameter for projects API | Marko, Peter | 2018-07-16 | 5 | -3/+48 |
| | | |||||
* | | Merge branch '49291-fix-memory-graph-component-typo' into 'master' | Filipa Lacerda | 2018-07-16 | 3 | -2/+7 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix typo in CSS transform property for Memory Graph component Closes #49291 See merge request gitlab-org/gitlab-ce!20650 | ||||
| * | | Add changelog entry | Kushal Pandya | 2018-07-16 | 1 | -0/+5 |
| | | | |||||
| * | | Fix `transform` typo | Kushal Pandya | 2018-07-16 | 2 | -2/+2 |
| | | | |||||
* | | | Merge branch '49061-submodule-helper-fix' into 'master' | Sean McGivern | 2018-07-16 | 2 | -17/+12 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "NoMethodError: undefined method `namespace' for nil:NilClass" Closes #49061 See merge request gitlab-org/gitlab-ce!20615 | ||||
| * | | | SubmoduleHelper - Project is not always available as an instance variable49061-submodule-helper-fix | Mario de la Ossa | 2018-07-15 | 2 | -17/+12 |
| | | | | |||||
* | | | | Merge branch 'frozen-string-enable-app-services' into 'master' | Rémy Coutable | 2018-07-16 | 48 | -13/+119 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Enable frozen string in apps/services/*.rb See merge request gitlab-org/gitlab-ce!20401 | ||||
| * | | | | Enable frozen string in apps/uploaders/*.rb | gfyoung | 2018-07-16 | 48 | -13/+119 |
| | | | | | | | | | | | | | | | | | | | | Partially addresses #47424. | ||||
* | | | | | Merge branch 'update-issue-closing-pattern' into 'master' | Rémy Coutable | 2018-07-16 | 3 | -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 message | George Tsiolis | 2018-07-11 | 1 | -0/+14 |
| | | | | | | |||||
| * | | | | | Update issue closing pattern | George Tsiolis | 2018-07-11 | 2 | -1/+6 |
| | | | | | | |||||
* | | | | | | Merge branch 'update-git-to-2-18-0' into 'master' | Stan Hu | 2018-07-16 | 2 | -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-0 | James Lopez | 2018-07-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Update Git version to 2.18.0 | James Lopez | 2018-07-09 | 1 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'dz-fix-com-architecture-link' into 'master' | Rémy Coutable | 2018-07-16 | 1 | -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-link | Dmitriy Zaporozhets | 2018-07-16 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'tweak-sql-buckets' into 'master' | Yorick Peterse | 2018-07-16 | 2 | -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-buckets | Yorick Peterse | 2018-07-10 | 2 | -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 Coutable | 2018-07-16 | 15 | -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 Wang | 2018-07-16 | 15 | -163/+381 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com> | ||||
* | | | | | | | | Merge branch 'patch-28' into 'master' | Rémy Coutable | 2018-07-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 10.6-to-10.7.md See merge request gitlab-org/gitlab-ce!20610 | ||||
| * | | | | | | | | Update 10.6-to-10.7.md | Mateusz | 2018-07-13 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'remove-repository-lookup' into 'master' | Sean McGivern | 2018-07-16 | 4 | -270/+11 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Repository#lookup and unreachable rugged code See merge request gitlab-org/gitlab-ce!20553 | ||||
| * | | | | | | | | Remove Repository#lookup and unreachable rugged code | Jacob Vosmaer (GitLab) | 2018-07-16 | 4 | -270/+11 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch ↵ | Sean McGivern | 2018-07-16 | 12 | -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 feedback | James Lopez | 2018-07-16 | 2 | -5/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | use fileuploader dynamic path method in uploads manager and add spec48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage | James Lopez | 2018-07-13 | 4 | -10/+18 |
| | | | | | | | | | |||||
| * | | | | | | | | fix typo in uploads manager | James Lopez | 2018-07-13 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | add small comment to download method in uploads manager | James Lopez | 2018-07-13 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | refactor uploads manager | James Lopez | 2018-07-13 | 1 | -7/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | update saver spec to use the old uploads code | James Lopez | 2018-07-12 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | refactor uploads manager to grab uploads in batches | James Lopez | 2018-07-12 | 1 | -6/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | fix uploads restorer missing path | James Lopez | 2018-07-12 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | fix spec | James Lopez | 2018-07-11 | 2 | -8/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | added changelog, small refactor | James Lopez | 2018-07-11 | 4 | -6/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | refactor uploads manager | James Lopez | 2018-07-11 | 3 | -8/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | fix uploads restorer | James Lopez | 2018-07-11 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | fix specs | James Lopez | 2018-07-11 | 4 | -13/+39 |
| | | | | | | | | | |||||
| * | | | | | | | | add restore method | James Lopez | 2018-07-11 | 2 | -3/+18 |
| | | | | | | | | | |||||
| * | | | | | | | | update uploads saver | James Lopez | 2018-07-10 | 4 | -15/+25 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix avatar saver and spec | James Lopez | 2018-07-10 | 2 | -5/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | add more object storage specs | James Lopez | 2018-07-10 | 2 | -5/+26 |
| | | | | | | | | | |||||
| * | | | | | | | | add upload manager and spec | James Lopez | 2018-07-10 | 2 | -0/+102 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/gb/rename-environments-stop-actions' into 'master' | Kamil Trzciński | 2018-07-16 | 10 | -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-actions | Grzegorz Bizon | 2018-07-12 | 2 | -22/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Rename environments stop action method | Grzegorz Bizon | 2018-07-12 | 8 | -17/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it more explicit that an environment is not a stop action, but instead is merely contains a stop action. |