summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fixed karma specide-live-preview-merge-requestsPhil Hughes2018-08-161-6/+14
|
* Fixed Web IDE live preview crashing when loading from merge requestPhil Hughes2018-08-162-3/+5
|
* Merge branch 'master' into 'master'Stan Hu2018-08-161-2/+2
|\ | | | | | | | | Added missing html_safe on text messages. See merge request gitlab-org/gitlab-ce!21232
| * 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/**/*.rb See merge request gitlab-org/gitlab-ce!21147
| * 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 template See merge request gitlab-org/gitlab-ce!21156
| * 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
|\ | | | | | | | | Core backports from the Premium license templates feature See merge request gitlab-org/gitlab-ce!21212
| * Changes /admin/application_settings to support template repository selection ↵Nick Thomas2018-08-152-0/+4
| | | | | | | | in EE
| * Allow the project_select_tag to specify an initial value and for the ↵Nick Thomas2018-08-151-0/+8
| | | | | | | | selection to be clear-able
| * 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 ↵Nick Thomas2018-08-143-6/+43
| | | | | | | | BaseTemplate.all from loading content
* | Merge branch 'n8rzz/consolidate-specs-testing-emoji-awards' into 'master'Robert Speicher2018-08-155-369/+353
|\ \ | | | | | | | | | | | | | | | | | | Duplicate specs testing emoji awards on issues Closes #45238 See merge request gitlab-org/gitlab-ce!21126
| * | Combines emoji award spec files into single ↵Nate Geslin2018-08-145-369/+353
| | | | | | | | | | | | | | | | | | user_interacts_with_awards_in_issue_spec Closes: #45238
* | | Merge branch 'backport-author-link-style' into 'master'Phil Hughes2018-08-151-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Add author-link style from common.scss in EE See merge request gitlab-org/gitlab-ce!21204
| * | | 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. Closes #49788 See merge request gitlab-org/gitlab-ce!21192
| * | | | Reduce number of model instances needed in test.Andreas Brandl2018-08-151-2/+2
| | | | | | | | | | | | | | | | | | | | Closes #49788.
* | | | | Merge branch 'bvl-add-czech' into 'master'Sean McGivern2018-08-152-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Czech as an available language Closes #43227 See merge request gitlab-org/gitlab-ce!21201
| * | | | | Add Czech as an available languageBob Van Landuyt2018-08-152-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | New translations added to `locale/cs_CZ` will automatically be picked up.
* | | | | | Merge branch 'docs-junit-test-reports' into 'master'Marcia Ramos2018-08-156-2/+154
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for JUnit XML Test Summary In MR widget Closes #49867 See merge request gitlab-org/gitlab-ce!21061
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port EE changes for mirrors/_instructions.html.haml See merge request gitlab-org/gitlab-ce!21107
| * | | | | | regenerate .potLuke Bennett2018-08-141-3/+0
| | | | | | |
| * | | | | | Merge branch 'master' into 'port-i18n-for-mirrors-instructions'Lin Jen-Shin2018-08-10133-853/+2135
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/mirrors/_instructions.html.haml
| * | | | | | | 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 ↵Nick Thomas2018-08-1511-6/+79
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add a "user_show_add_ssh_key_message" application setting for use with SSH certificates Closes #49953 See merge request gitlab-org/gitlab-ce!21027
| * | | | | | | | Add ability suppress the global "You won't be able [use] SSH" messageÆvar Arnfjörð Bjarmason2018-08-0811-6/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes gitlab-org/gitlab-ce#49953, as noted in the documentation this feature is intended to be used when SSH certificates are enabled. Then this warning becomes not only pointless, but also misleading. This builds on top of gitlab-org/gitlab-ce!21009 since both need to modify the same documentation, which avoids a merge conflict. See also the gitlab-org/gitlab-ce#49218 issue and associated merge request.
* | | | | | | | | 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/6860 See merge request gitlab-org/gitlab-ce!21200
| * | | | | | | | | 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 block See merge request gitlab-org/gitlab-ce!21198
| * | | | | | | | | | 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 See merge request gitlab-org/gitlab-ce!21205
| * | | | | | | | | | chore(docs): add field repository_update_events Jens Goldhammer2018-08-141-1/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | - adds the field repository_update_events as json field
* | | | | | | | | | Merge branch 'mk/bump-rainbow-gem' into 'master'James Lopez2018-08-156-12/+17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `bin/secpick` rainbow gem error, and security branch prefixing See merge request gitlab-org/gitlab-ce!21210
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "JS Pages do not load on windows 8, IE 11" Closes #50281 See merge request gitlab-org/gitlab-ce!21214
| * | | | | | | | | | 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.28 Closes #50294 See merge request gitlab-org/gitlab-ce!21191
| * | | | | | | | | | | Vendor in Auto-DevOps.gitlab-ci.yml to update glibc to 2.28Thong Kuah2018-08-152-3/+8
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vendored from https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/186 Thanks @sgerrand !
* | | | | | | | | | | Merge branch 'tz-mr-incremental-rendering' into 'master'Mike Greiling2018-08-1511-10/+121
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR Page incremental rendering See merge request gitlab-org/gitlab-ce!21063
| * | | | | | | | | | | Added compute property to diff file + changed a for loopTim Zallmann2018-08-142-2/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Added the actual descriptionTim Zallmann2018-08-131-3/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Added ChangelogTim Zallmann2018-08-131-0/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed ESLint errorTim Zallmann2018-08-131-3/+0
| | | | | | | | | | | |
View Lorry Controller Status