summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Enable frozen string in apps/services/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-innergfyoung2018-07-16101-3/+208
* Merge branch 'fix-project-api-archived' into 'master'Rémy Coutable2018-07-165-3/+48
|\
| * Fix archived parameter for projects APIMarko, Peter2018-07-165-3/+48
* | Merge branch '49291-fix-memory-graph-component-typo' into 'master'Filipa Lacerda2018-07-163-2/+7
|\ \
| * | Add changelog entryKushal Pandya2018-07-161-0/+5
| * | Fix `transform` typoKushal Pandya2018-07-162-2/+2
* | | Merge branch '49061-submodule-helper-fix' into 'master'Sean McGivern2018-07-162-17/+12
|\ \ \
| * | | SubmoduleHelper - Project is not always available as an instance variable49061-submodule-helper-fixMario de la Ossa2018-07-152-17/+12
* | | | Merge branch 'frozen-string-enable-app-services' into 'master'Rémy Coutable2018-07-1648-13/+119
|\ \ \ \
| * | | | Enable frozen string in apps/uploaders/*.rbgfyoung2018-07-1648-13/+119
* | | | | Merge branch 'update-issue-closing-pattern' into 'master'Rémy Coutable2018-07-163-1/+20
|\ \ \ \ \
| * | | | | 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 .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.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 timingstweak-sql-bucketsYorick Peterse2018-07-102-1/+6
* | | | | | | | Merge branch 'i18n-extract-app/views/import' into 'master'Rémy Coutable2018-07-1615-163/+381
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | i18n: externalize strings from 'app/views/import'Tao Wang2018-07-1615-163/+381
* | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-07-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 codeJacob Vosmaer (GitLab)2018-07-164-270/+11
|/ / / / / / / /
* | | | | | | | Merge branch '48745-project-exports-fail-when-uploads-have-been-migrated-to-o...Sean McGivern2018-07-1612-25/+244
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
* | | | | | | | | | Merge branch 'i18n-extract-app/views/doorkeeper' into 'master'Rémy Coutable2018-07-1613-61/+163
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | i18n: externalize strings from 'app/views/doorkeeper'Tao Wang2018-07-1313-61/+163