summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add feature tests for CI/CD `extends` keywordfeature/gb/allow-to-extend-keys-in-gitlab-ci-ymlGrzegorz Bizon2018-08-172-0/+76
* Add support for `extends` key in CI/CD configurationGrzegorz Bizon2018-08-174-9/+54
* Add test case describing circular dependency in `extends`Grzegorz Bizon2018-08-171-0/+11
* Improve extended CI/CD config specs and fix a bugGrzegorz Bizon2018-08-174-11/+13
* Use deep_dup to duplicate hash in CI/CD extendable configGrzegorz Bizon2018-08-171-1/+1
* Add specs for extendable CI/CD hash entry classGrzegorz Bizon2018-08-173-19/+248
* Improve extendable CI/CD config hash collectionGrzegorz Bizon2018-08-173-35/+45
* Add test for simple ciricular dependency in `extends`Grzegorz Bizon2018-08-161-2/+20
* Detect circular dependenies in CI/CD `extends:` entryGrzegorz Bizon2018-08-163-6/+42
* Do not modify extensible CI/CD entries by referenceGrzegorz Bizon2018-08-162-18/+13
* Support recursive `extends:` in `.gitlab-ci.yml`Grzegorz Bizon2018-08-165-94/+207
* Add basic support for CI/CD config extensionGrzegorz Bizon2018-08-162-0/+94
* Merge branch 'zj-remove-flags-find-all-brances' into 'master'50326-ocd-pipelineSean McGivern2018-08-161-28/+1
|\
| * Remove feature flag for FindAllRemoteBranchesZeger-Jan van de Weg2018-08-161-28/+1
* | Merge branch 'ide-delete-new-files-state' into 'master'Filipa Lacerda2018-08-163-1/+38
|\ \
| * | Fixed deleting new files creating wrong state in IDEide-delete-new-files-statePhil Hughes2018-08-153-1/+38
* | | Merge branch 'master' into 'master'Stan Hu2018-08-161-2/+2
|\ \ \
| * | | Added missing html_safe on text messages.Alexander Kutelev2018-08-161-2/+2
|/ / /
* | | Merge branch 'frozen-string-enable-app-mailers' into 'master'Stan Hu2018-08-1519-12/+56
|\ \ \
| * | | Enable frozen in app/mailers/**/*.rbgfyoung2018-08-1519-12/+56
|/ / /
* | | Merge branch 'zj-feature-flag' into 'master'50200-change-diagram-in-ha-infrastructure-gitlab-documentation-gitlab-university-high-availability-on-awsRobert Speicher2018-08-153-2/+135
|\ \ \
| * | | Add Acceptance testing issue templateZeger-Jan van de Weg2018-08-153-2/+135
|/ / /
* | | Merge branch 'backport-5986-license-templates' into 'master'Robert Speicher2018-08-1514-42/+277
|\ \ \
| * | | Changes /admin/application_settings to support template repository selection ...Nick Thomas2018-08-152-0/+4
| * | | Allow the project_select_tag to specify an initial value and for the selectio...Nick Thomas2018-08-151-0/+8
| * | | Convert the license template API to use the new LicenseTemplateFinderNick Thomas2018-08-153-31/+18
| * | | Convert BlobHelper#licenses_for_select to use the new LicenseTemplateFinderNick Thomas2018-08-151-5/+7
| * | | Introduce a LicenseTemplate model and LicenseTemplateFinder helperNick Thomas2018-08-154-0/+197
| * | | Fix bugs in Gitlab::Template::Finders preventing instances from BaseTemplate....Nick Thomas2018-08-143-6/+43
* | | | Merge branch 'n8rzz/consolidate-specs-testing-emoji-awards' into 'master'Robert Speicher2018-08-155-369/+353
|\ \ \ \
| * | | | Combines emoji award spec files into single user_interacts_with_awards_in_iss...Nate Geslin2018-08-145-369/+353
* | | | | Merge branch 'backport-author-link-style' into 'master'Phil Hughes2018-08-151-0/+4
|\ \ \ \ \
| * | | | | Add author-link style from common.scss in EEAnnabel Dunstone Gray2018-08-141-0/+4
* | | | | | Merge branch 'ab-49788-reduce-model-instances-in-test' into 'master'Sean McGivern2018-08-151-2/+2
|\ \ \ \ \ \
| * | | | | | Reduce number of model instances needed in test.Andreas Brandl2018-08-151-2/+2
* | | | | | | Merge branch 'bvl-add-czech' into 'master'Sean McGivern2018-08-152-1/+7
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add Czech as an available languageBob Van Landuyt2018-08-152-1/+7
* | | | | | | Merge branch 'docs-junit-test-reports' into 'master'Marcia Ramos2018-08-156-2/+154
|\ \ \ \ \ \ \
| * | | | | | | Documentation for JUnit XML Test Summary In MR widgetShinya Maeda2018-08-156-2/+154
|/ / / / / / /
* | | | | | | Merge branch 'port-i18n-for-mirrors-instructions' into 'master'Douwe Maan2018-08-152-4/+1
|\ \ \ \ \ \ \
| * | | | | | | regenerate .potLuke Bennett2018-08-141-3/+0
| * | | | | | | Merge branch 'master' into 'port-i18n-for-mirrors-instructions'Lin Jen-Shin2018-08-10133-853/+2135
| |\ \ \ \ \ \ \
| * | | | | | | | Update gitlab.potLin Jen-Shin2018-08-091-0/+12
| * | | | | | | | Port EE changesLin Jen-Shin2018-08-091-7/+8
* | | | | | | | | Merge branch 'add-user_show_add_ssh_key_message-application-setting' into 'ma...Nick Thomas2018-08-1511-6/+79
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add ability suppress the global "You won't be able [use] SSH" messageÆvar Arnfjörð Bjarmason2018-08-0811-6/+79
* | | | | | | | | | Merge branch '6541-custom-favicons-not-being-replicated-by-geo' into 'master'Nick Thomas2018-08-152-0/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6860Valery Sizov2018-08-142-0/+9
* | | | | | | | | | Merge branch '50101-aritfacts-block' into 'master'50193-enable-auto-devops-instance-wide-on-gitlab-comPhil Hughes2018-08-154-0/+241
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Creates vue component for artifacts blockFilipa Lacerda2018-08-154-0/+241
|/ / / / / / / / / /
View Lorry Controller Status