summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-01115-200/+214
|
* Merge branch '33620-remove-events-from-notification_settings' into 'master'Douwe Maan2017-08-018-42/+29
|\ | | | | | | | | | | | | Resolve "Remove `events` from `notification_settings`" Closes #33620 See merge request !13152
| * Remove events column from notification settings33620-remove-events-from-notification_settingsSean McGivern2017-07-318-42/+29
| | | | | | | | | | This was migrated to separate columns in 9.4, and now just needs to be removed for real.
* | Merge branch '34869-bump-rubocop-to-0-49-1-and-rubocop-rspec-to-1-15-1' into ↵Robert Speicher2017-08-015-314/+383
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1 Closes #34869 See merge request !12741
| * | Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1Takuya Noguchi2017-08-015-314/+383
| | |
* | | Merge branch 'doc_code_review' into 'master'Rémy Coutable2017-08-011-0/+3
|\ \ \ | | | | | | | | | | | | | | | | Add code review guidelines related to Build [CI skip]. See merge request !13223
| * | | Add code review guidelines related to Build [CI skip].Marin Jankovski2017-08-011-0/+3
|/ / /
* | | Merge branch 'fix/sm/35825-api-specs-and-linting-failing-on-master' into ↵Rémy Coutable2017-08-012-4/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix "API specs and linting failing on master" Closes #35825 See merge request !13227
| * | | Add 204. Remove duplicated method.fix/sm/35825-api-specs-and-linting-failing-on-masterShinya Maeda2017-08-012-4/+1
| | | |
* | | | Merge branch 'winh-cycle-analytics-dropdown-style' into 'master'Annabel Dunstone Gray2017-08-011-0/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make time span dropdown style on cycle analytics page consistent See merge request !13183
| * | | | Make time span dropdown style on cycle analytics page consistentWinnie Hellmann2017-08-011-0/+22
|/ / / /
* | | | Merge branch 'rc/fetch-before-finding-merge-base-in-ee_compat_check' into ↵Sean McGivern2017-08-011-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Always fetch branches before finding the merge base, otherwise we could find an outdated merge base See merge request !13226
| * | | | Always fetch branches before finding the merge base, otherwise we could find ↵rc/fetch-before-finding-merge-base-in-ee_compat_checkRémy Coutable2017-08-011-2/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | an outdated merge base Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'blob-limit-test' into 'master'Sean McGivern2017-08-011-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix bug in blob test See merge request !13224
| * | | | Fix bug in blob testJacob Vosmaer2017-08-011-2/+8
| | | | |
* | | | | Merge branch '28283-legacy-storage-format' into 'master'Sean McGivern2017-08-01117-481/+590
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [CE] Added Legacy Storage format See merge request !13149
| * | | | | Small refactor in LegacyNamespace and moved back send_update_instructions28283-legacy-storage-formatGabriel Mazetto2017-08-012-9/+8
| | | | | |
| * | | | | Rename ensure_dir_exist -> ensure_storage_path_existGabriel Mazetto2017-08-015-6/+6
| | | | | |
| * | | | | Added some extra TODOs for the Legacy Storage refactorGabriel Mazetto2017-08-012-0/+3
| | | | | |
| * | | | | Make disk_path keyword argument and optionalGabriel Mazetto2017-08-014-8/+7
| | | | | |
| * | | | | Rename more path_with_namespace -> full_path or disk_pathGabriel Mazetto2017-08-0138-109/+137
| | | | | |
| * | | | | Rename path_with_namespace -> disk_path when dealing with the filesystemGabriel Mazetto2017-08-0114-26/+26
| | | | | |
| * | | | | Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-0170-185/+239
| | | | | |
| * | | | | Move storage specific code from Namespace and Project to concernsGabriel Mazetto2017-08-014-168/+194
| | | | | |
* | | | | | Merge branch '35627-lint-for-conflict' into 'master'Rémy Coutable2017-08-012-1/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we didn't commit conflicts Closes #35627 See merge request !13141
| * | | | | Make sure we didn't commit conflictsLin Jen-Shin (godfat)2017-08-012-1/+7
|/ / / / /
* | | | | Merge branch '35690-dropdown' into 'master'Phil Hughes2017-08-011-3/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes dropdown margin in sidebar Closes #35690 See merge request !13205
| * | | | | Fixes dropdown margin in sidebarFilipa Lacerda2017-08-011-3/+1
|/ / / / /
* | | | | Merge branch 'gitaly-commit-languages' into 'master'Sean McGivern2017-08-0112-62/+125
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Add option to use Gitaly CommitLanguages RPC See merge request !13084
| * | | | Add option to use CommitLanguages RPCJacob Vosmaer2017-08-016-51/+75
| | | | |
| * | | | CI fixes for gitaly-rubyJacob Vosmaer2017-08-016-11/+50
| | | | |
* | | | | Merge branch ↵Rémy Coutable2017-08-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/remove-services-true-from-pipeline_trigger_service_spec' into 'master' Remove `services: true` from spec/services/ci/pipeline_trigger_service_spec.rb See merge request !13219
| * | | | | fixfix/sm/remove-services-true-from-pipeline_trigger_service_specShinya Maeda2017-08-011-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'mk-fix-deploy-key-deletion' into 'master'Yorick Peterse2017-08-013-10/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deletion of deploy keys linked to other projects Closes #35630 See merge request !13162
| * | | | | Exclude keys linked to other projectsmk-fix-deploy-key-deletionMichael Kozono2017-07-283-10/+49
| | |_|_|/ | |/| | |
* | | | | Merge branch 'remove-content-commit' into 'master'Douwe Maan2017-08-012-26/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unused Gitlab::Diff code See merge request !13195
| * | | | | Remove unused (?) codeJacob Vosmaer2017-07-312-26/+0
| | | | | |
* | | | | | Merge branch 'patch-25' into 'master'Rémy Coutable2017-08-011-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invalid variable See merge request !13214
| * | | | | | Invalid variableSemen Romanov2017-08-011-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-08-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix username typo (jonh to John) See merge request !13210
| * | | | | | Fix username typo (jonh to John)John Landa2017-08-011-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '34492-firefox-job' into 'master'Phil Hughes2017-08-012-9/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses jQuery to scroll since setting document.body.scrollTop does not work in firefox Closes #34492 See merge request !13203
| * | | | | | Uses jQuery to scroll since setting document.body.scrollTop does not work in ↵34492-firefox-jobFilipa Lacerda2017-07-312-9/+14
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | firefox
* | | | | | Merge branch '34519-extend-api-group-secret-variable' into 'master'Kamil Trzciński2017-08-018-7/+458
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend API: Group Secret Variable Closes #34519 See merge request !12936
| * | | | | | Document update34519-extend-api-group-secret-variableShinya Maeda2017-07-193-7/+133
| | | | | | |
| * | | | | | Add changelogShinya Maeda2017-07-191-0/+4
| | | | | | |
| * | | | | | IniShinya Maeda2017-07-194-0/+321
| | | | | | |
* | | | | | | Merge branch 'docs-add-blog-articles' into 'master'Job van der Voort2017-08-011-24/+90
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs add blog articles Closes #34633 See merge request !13209
| * | | | | | | Docs add blog articlesMarcia Ramos2017-08-011-24/+90
|/ / / / / / /
* | | | | | | Merge branch 'inline-script-cleanup-globals-and-easy' into 'master'Phil Hughes2017-08-0128-262/+290
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline script cleanup globals and easy See merge request !12969