summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix find_branch call sitesgitaly-mandatory-20180712-jvJacob Vosmaer2018-07-123-21/+3
|
* whitespaceJacob Vosmaer2018-07-121-9/+9
|
* Make more ref RPC's mandatoryJacob Vosmaer2018-07-122-172/+22
|
* Merge branch '48789-remove-event-listeners-scroll' into 'master'Phil Hughes2018-07-127-84/+27
|\ | | | | | | | | | | | | Resolve "Improve performance of MR Changes tab: reduce event listeners on scroll event" Closes #48639 and #48789 See merge request gitlab-org/gitlab-ce!20558
| * Resolve "Improve performance of MR Changes tab: reduce event listeners on ↵Filipa Lacerda2018-07-127-84/+27
|/ | | | scroll event"
* Merge branch 'winh-remove-service-architecture-docs' into 'master'Filipa Lacerda2018-07-122-228/+11
|\ | | | | | | | | Remove old service architecture from Vue docs See merge request gitlab-org/gitlab-ce!20579
| * Remove old service architecture from Vue docsWinnie Hellmann2018-07-122-228/+11
|/
* Merge branch 'qa-264' into 'master'Rémy Coutable2018-07-1217-22/+229
|\ | | | | | | | | Adding spec to test basic forking functionalities See merge request gitlab-org/gitlab-ce!20097
| * Adding spec to test basic forking functionalitiesMykhailo Formus2018-07-1217-22/+229
|/
* Merge branch '48690-follow-up-from-milestone-tests' into 'master'Rémy Coutable2018-07-123-11/+13
|\ | | | | | | | | | | | | Resolve "Follow-up from "Milestone tests"" Closes #48690 See merge request gitlab-org/gitlab-ce!20563
| * move #has_milestone? to issuable sidebar;48690-follow-up-from-milestone-testsddavison2018-07-113-11/+13
| | | | | | | | closes #48690
* | Merge branch 'dz-manifest-import' into 'master'Douwe Maan2018-07-1230-55/+1313
|\ \ | | | | | | | | | | | | Add manifest import See merge request gitlab-org/gitlab-ce!20304
| * | Fix CI/CD importdz-manifest-importDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | It seems that fronted ci_cd_only variable must be a string Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add newly translated strings to locale/gitlab.potDmitriy Zaporozhets2018-07-111-0/+21
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add mysql and postgres spec for manifest import buttonDmitriy Zaporozhets2018-07-111-2/+17
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix a link to subgroup doc from manifest docDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Improve manifest feature after backend reviewDmitriy Zaporozhets2018-07-1112-53/+57
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Improve manifest feature frontend after reviewDmitriy Zaporozhets2018-07-113-21/+26
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Rename button at manifest import formDmitriy Zaporozhets2018-07-114-4/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Make the manifest import feature spec a postgres onlyDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Refactor manifest import codeDmitriy Zaporozhets2018-07-116-17/+12
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add feature specs for manifest importDmitriy Zaporozhets2018-07-113-3/+26
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Move manifest import to separate page and add feature specsDmitriy Zaporozhets2018-07-115-9/+38
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix icon for manifest import and mention manifest feature in APIDmitriy Zaporozhets2018-07-112-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add documentation for manifest import featureDmitriy Zaporozhets2018-07-115-1/+46
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add ability to disable manifest importDmitriy Zaporozhets2018-07-113-5/+21
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Improve manifest import logicDmitriy Zaporozhets2018-07-114-28/+41
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | More reliable manifest parser and group-only selectorDmitriy Zaporozhets2018-07-114-10/+26
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix tests in import_sources_spec.rbDmitriy Zaporozhets2018-07-113-5/+10
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add changelog for manifest import featureDmitriy Zaporozhets2018-07-111-0/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add manifest import featureDmitriy Zaporozhets2018-07-1114-18/+1084
| | | | | | | | | | | | | | | | | | | | | | | | | | | It allows user to automatically import multiple repositories with nested structure by uploading a manifest xml file. AOSP project was used as an example during development of this feature. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'docs-add-api-params-array-hash' into 'master'Douwe Maan2018-07-121-1/+31
|\ \ \ | | | | | | | | | | | | | | | | Add examples for array and hash type API params See merge request gitlab-org/gitlab-ce!20574
| * | | Add examples for array and hash type API paramsdocs-add-api-params-array-hashAthar Hameed2018-07-121-1/+31
| | | |
* | | | Merge branch 'sh-optimize-wiki-empty-check' into 'master'Douwe Maan2018-07-123-2/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Optimize ProjectWiki#empty? check See merge request gitlab-org/gitlab-ce!20573
| * | | | Fix Dangerfilesh-optimize-wiki-empty-checkStan Hu2018-07-121-1/+1
| | | | |
| * | | | Optimize ProjectWiki#empty? checkStan Hu2018-07-123-2/+18
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `empty?` check was iterating over all Wiki pages to determine whether it was empty. Using the limit parameter allows us to bail out early once we found a page. Note that this currently only improves performance for GitLab 11.0 until https://gitlab.com/gitlab-org/gitaly/issues/1204 is fixed. Relates to #40101
* | | | Merge branch 'i18n-extract-app/views/explore' into 'master'Rémy Coutable2018-07-129-21/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | i18n: externalize strings from 'app/views/explore' See merge request gitlab-org/gitlab-ce!19713
| * | | | i18n: externalize strings from 'app/views/explore'Tao Wang2018-07-109-21/+57
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | | | Merge branch 'docs-fix-typo-eks' into 'master'Marcia Ramos2018-07-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix typo on EKS doc Closes #47421 See merge request gitlab-org/gitlab-ce!20582
| * | | | | typoMarcia Ramos2018-07-121-1/+1
| | | | | |
* | | | | | Merge branch 'gitaly-serverservice-info-timeout' into 'master'Rémy Coutable2018-07-123-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a fast_timeout for the `ServerService.ServerInfo` endpoint Closes #49116 See merge request gitlab-org/gitlab-ce!20552
| * | | | | | Add a fast_timeout for the `ServerService.ServerInfo` endpointgitaly-serverservice-info-timeoutAndrew Newdigate2018-07-113-2/+7
| | | | | | |
* | | | | | | Merge branch 'project_import_export_update' into 'master'Marcia Ramos2018-07-121-1/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update project_import_export.md to include example remote import script and additional curl command See merge request gitlab-org/gitlab-ce!20529
| * | | | | | | Update project_import_export.md. Removed cURL statementproject_import_export_updateMichael Leopard2018-07-101-5/+0
| | | | | | | |
| * | | | | | | Update project_import_export.md to include example remote import script and ↵Michael Leopard2018-07-101-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional curl command
* | | | | | | | Merge branch 'mk/remove-push-output-logging' into 'master'Rémy Coutable2018-07-121-18/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Revert "Log push output on exception" because it is no longer needed See merge request gitlab-org/gitlab-ce!20564
| * | | | | | | Revert "Log push output on exception"mk/remove-push-output-loggingMichael Kozono2018-07-111-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d493c91d21250e0b94a14f1808fcf8bb6f1a8d03.
* | | | | | | | Merge branch 'select-letters-and-numbers' into 'master'Nick Thomas2018-07-121-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match against having letters and numbers for environment name See merge request gitlab-org/gitlab-ce!20570
| * | | | | | | | We want letters and numbersselect-letters-and-numbersLin Jen-Shin2018-07-121-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'gitlab-git-dont-memoize-path' into 'master'Sean McGivern2018-07-129-176/+107
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Repository#path memoization See merge request gitlab-org/gitlab-ce!20491