summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qa-264' into 'master'Rémy Coutable2018-07-1217-22/+229
|\
| * 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
|\
| * move #has_milestone? to issuable sidebar;48690-follow-up-from-milestone-testsddavison2018-07-113-11/+13
* | Merge branch 'dz-manifest-import' into 'master'Douwe Maan2018-07-1230-55/+1313
|\ \
| * | Fix CI/CD importdz-manifest-importDmitriy Zaporozhets2018-07-111-1/+1
| * | Add newly translated strings to locale/gitlab.potDmitriy Zaporozhets2018-07-111-0/+21
| * | Add mysql and postgres spec for manifest import buttonDmitriy Zaporozhets2018-07-111-2/+17
| * | Fix a link to subgroup doc from manifest docDmitriy Zaporozhets2018-07-111-1/+1
| * | Improve manifest feature after backend reviewDmitriy Zaporozhets2018-07-1112-53/+57
| * | Improve manifest feature frontend after reviewDmitriy Zaporozhets2018-07-113-21/+26
| * | Rename button at manifest import formDmitriy Zaporozhets2018-07-114-4/+4
| * | Make the manifest import feature spec a postgres onlyDmitriy Zaporozhets2018-07-111-1/+1
| * | Refactor manifest import codeDmitriy Zaporozhets2018-07-116-17/+12
| * | Add feature specs for manifest importDmitriy Zaporozhets2018-07-113-3/+26
| * | Move manifest import to separate page and add feature specsDmitriy Zaporozhets2018-07-115-9/+38
| * | Fix icon for manifest import and mention manifest feature in APIDmitriy Zaporozhets2018-07-112-2/+2
| * | Add documentation for manifest import featureDmitriy Zaporozhets2018-07-115-1/+46
| * | Add ability to disable manifest importDmitriy Zaporozhets2018-07-113-5/+21
| * | Improve manifest import logicDmitriy Zaporozhets2018-07-114-28/+41
| * | More reliable manifest parser and group-only selectorDmitriy Zaporozhets2018-07-114-10/+26
| * | Fix tests in import_sources_spec.rbDmitriy Zaporozhets2018-07-113-5/+10
| * | Add changelog for manifest import featureDmitriy Zaporozhets2018-07-111-0/+5
| * | Add manifest import featureDmitriy Zaporozhets2018-07-1114-18/+1084
* | | Merge branch 'docs-add-api-params-array-hash' into 'master'Douwe Maan2018-07-121-1/+31
|\ \ \
| * | | 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
|\ \ \ \
| * | | | Fix Dangerfilesh-optimize-wiki-empty-checkStan Hu2018-07-121-1/+1
| * | | | Optimize ProjectWiki#empty? checkStan Hu2018-07-123-2/+18
| |/ / /
* | | | Merge branch 'i18n-extract-app/views/explore' into 'master'Rémy Coutable2018-07-129-21/+57
|\ \ \ \
| * | | | i18n: externalize strings from 'app/views/explore'Tao Wang2018-07-109-21/+57
* | | | | Merge branch 'docs-fix-typo-eks' into 'master'Marcia Ramos2018-07-121-1/+1
|\ \ \ \ \
| * | | | | 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` 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. Removed cURL statementproject_import_export_updateMichael Leopard2018-07-101-5/+0
| * | | | | | | Update project_import_export.md to include example remote import script and a...Michael Leopard2018-07-101-0/+31
* | | | | | | | Merge branch 'mk/remove-push-output-logging' into 'master'Rémy Coutable2018-07-121-18/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Revert "Log push output on exception"mk/remove-push-output-loggingMichael Kozono2018-07-111-18/+6
* | | | | | | | Merge branch 'select-letters-and-numbers' into 'master'Nick Thomas2018-07-121-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 memoizationJacob Vosmaer (GitLab)2018-07-129-176/+107
|/ / / / / / / /
* | | | | | | | Merge branch '46930-fix-updated_at-if-created_at-is-set-note-api' into 'master'Rémy Coutable2018-07-124-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "do not set updated_at when creating note"Kia Mei Somabes2018-07-124-0/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'ide-row-dropdown-design-update' into 'master'Filipa Lacerda2018-07-1222-247/+357
|\ \ \ \ \ \ \ \
| * | | | | | | | Improvements to new entry dropdowns in Web IDEPhil Hughes2018-07-1122-247/+357
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'sh-fix-dangerfile' into 'master'Rémy Coutable2018-07-121-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix DangerfileStan Hu2018-07-121-1/+1
|/ / / / / / / /