summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add migration to cleanup internal_ids.ab-49754-gh-importer-internal-idsAndreas Brandl2018-08-173-0/+171
* Trigger iid logic from GitHub importer for merge requests.Andreas Brandl2018-08-162-1/+17
* Trigger iid logic from GitHub importer for milestones.Andreas Brandl2018-08-165-6/+42
* Trigger iid logic from GitHub importer for issues.Andreas Brandl2018-08-162-1/+27
* 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
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-update-system-hooks-api' into 'master'Sean McGivern2018-08-151-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | chore(docs): add field repository_update_events Jens Goldhammer2018-08-141-1/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mk/bump-rainbow-gem' into 'master'James Lopez2018-08-156-12/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix `bin/secpick` rainbow gem error, and security branch prefixingMichael Kozono2018-08-156-12/+17
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '50281-js-pages-do-not-load-on-windows-8-ie-11' into 'master'Tim Zallmann2018-08-152-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add CHANGELOG.md entry for !21214Mike Greiling2018-08-151-0/+5
| * | | | | | | | | | add polyfill for String.prototype.includesMike Greiling2018-08-151-0/+1
* | | | | | | | | | | Merge branch 'auto-devops-gitlab-ci-glic-228' into 'master'Grzegorz Bizon2018-08-152-3/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Vendor in Auto-DevOps.gitlab-ci.yml to update glibc to 2.28Thong Kuah2018-08-152-3/+8
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tz-mr-incremental-rendering' into 'master'Mike Greiling2018-08-1511-10/+121
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added compute property to diff file + changed a for loopTim Zallmann2018-08-142-2/+5
| * | | | | | | | | | | Added the actual descriptionTim Zallmann2018-08-131-3/+2
View Lorry Controller Status