delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Delete Research proposal.mdremove-research-template	Sarah O'Donnell	2018-11-23	1	-17/+0
\|
*	Merge branch 'jprovazn-locale-fix' into 'master'	Grzegorz Bizon	2018-11-23	2	-4/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Explicitly set locale fallbacks Closes #54274 See merge request gitlab-org/gitlab-ce!23271
\| *	Explicitly set locale fallbacksjprovazn-locale-fix	Jan Provaznik	2018-11-21	2	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With a recent change in i18n, default language is not included in fallbacks by default. This causes that MissingTranslationData exception is raised both in development and production mode. This patch sets explicitly fallbacks language to english which assures that english is used for missing translations.
* \|	Merge branch 'rails5-deprecation-render-nothing' into 'master'	Rémy Coutable	2018-11-23	6	-9/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 deprecation: :nothing option is deprecated, Use head method to respond with empty response body. See merge request gitlab-org/gitlab-ce!23311
\| * \|	render :nothing option is deprecated, Use head method to respond with empty ↵	Jasper Maes	2018-11-23	6	-9/+15
\| \| \| \| \| \| \| \| \| \| \| \|	response body.
* \| \|	Merge branch '54391-tag' into 'master'	Phil Hughes	2018-11-23	2	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly styles tags in jobs sidebar Closes #54391 See merge request gitlab-org/gitlab-ce!23319
\| * \| \|	Correctly styles tags in jobs sidebar	Filipa Lacerda	2018-11-23	2	-1/+6
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	The tags were using the `label` class instead of `bagde` which is the new BS class
* \| \|	Merge branch '_acet-fix-unable-to-reply-resolved-nondiff-discussion' into ↵	Phil Hughes	2018-11-23	3	-3/+56
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Allow commenting to resolved non-diff discussions Closes #54330 See merge request gitlab-org/gitlab-ce!23279
\| * \| \|	Allow commenting to resolved non-diff discussions_acet-fix-unable-to-reply-resolved-nondiff-discussion	Fatih Acet	2018-11-22	3	-3/+56
\| \| \| \|
* \| \| \|	Merge branch 'ce-backport-3777-promote-to-epic' into 'master'	Rémy Coutable	2018-11-23	2	-3/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for custom highlighting slash commands via warning flags See merge request gitlab-org/gitlab-ce!23277
\| * \| \| \|	Add support for custom highlighting slash commands via warning flagsce-backport-3777-promote-to-epic	Kushal Pandya	2018-11-21	2	-3/+27
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rails5-env-deprecated' into 'master'	Sean McGivern	2018-11-23	3	-2/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5: env is deprecated and will be removed from Rails 5.1 Closes #54384 See merge request gitlab-org/gitlab-ce!22626
\| * \| \| \| \|	Rails5: env is deprecated and will be removed from Rails 5.1	Jasper Maes	2018-11-15	3	-2/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-batch-loader-sidekiq' into 'master'	Stan Hu	2018-11-22	3	-0/+19
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear BatchLoader context between Sidekiq jobs Closes #53079 See merge request gitlab-org/gitlab-ce!23308
\| * \| \| \| \|	Clear BatchLoader context between Sidekiq jobs	Douwe Maan	2018-11-22	3	-0/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'update-gitlab-runner-helm-chart-version' into 'master'	Kamil Trzciński	2018-11-22	3	-4/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Runner Chart to 0.1.38 See merge request gitlab-org/gitlab-ce!23304
\| * \| \| \| \| \|	Add CHANGELOG entryupdate-gitlab-runner-helm-chart-version	Tomasz Maczukin	2018-11-22	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update used version of Runner Helm Chart to 0.1.38	Tomasz Maczukin	2018-11-22	2	-4/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'gt-include-wildcard-for-gitlab-assets-compile-only-parameter' ↵	Rémy Coutable	2018-11-22	1	-4/+4
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Include wildcard for `gitlab:assets:compile` only parameter See merge request gitlab-org/gitlab-ce!23305
\| * \| \| \| \| \|	Include wildcard for `gitlab:assets:compile` only parameter	George Tsiolis	2018-11-22	1	-4/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'patch-32' into 'master'	Stan Hu	2018-11-22	1	-2/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation: Correct blocked SMTP ports for GKE See merge request gitlab-org/gitlab-ce!23275
\| * \| \| \| \| \|	Correct blocked SMTP ports for GKE	Max Winterstein	2018-11-21	1	-2/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '48534-autocomplete-spec' into 'master'	Kamil Trzciński	2018-11-22	1	-7/+47
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specs for entities autocomplete Closes #48534 See merge request gitlab-org/gitlab-ce!23250
\| * \| \| \| \| \| \|	Add specs for entities autocomplete	Jarka Košanová	2018-11-22	1	-7/+47
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '349-qa-add-params-for-qa-variables' into 'master'	Rémy Coutable	2018-11-22	3	-2/+10
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More env vars for group & project names in QA See merge request gitlab-org/gitlab-ce!23303
\| * \| \| \| \| \| \|	More env vars for group & project names in QA	Dylan Griffith	2018-11-22	3	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will help with https://gitlab.com/gitlab-org/gitlab-qa/issues/349 as we need to use much shorter project and group names for HTTPS to work
* \| \| \| \| \| \| \|	Merge branch 'mr-sticky-headers' into 'master'	Filipa Lacerda	2018-11-22	3	-0/+31
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made diff file headers sticky Closes #48816 See merge request gitlab-org/gitlab-ce!23249
\| * \| \| \| \| \| \| \|	Made diff file headers sticky	Phil Hughes	2018-11-22	3	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48816
* \| \| \| \| \| \| \| \|	Merge branch 'jprovazn-versioned-migrations' into 'master'	Rémy Coutable	2018-11-22	1067	-1067/+1086
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add rails version to all migrations Closes #54098 See merge request gitlab-org/gitlab-ce!23057
\| * \| \| \| \| \| \| \| \|	Add version 4.2 to all existing migrationsjprovazn-versioned-migrations	Jan Provaznik	2018-11-22	1062	-1064/+1064
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DB schema generated by a migration may look different in rails 4 and 5 (because rails 5 may use different default values). For this reason it's important to explicitly set for which rails version a migration was written for. See https://stackoverflow.com/questions/35929869/activerecordmigration-deprecation-warning-asks-for-rails-version-but-im-no/35930912#35930912
\| * \| \| \| \| \| \| \| \|	Update generator templates	Jan Provaznik	2018-11-22	3	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add version migration support to rails 4	Jan Provaznik	2018-11-22	2	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When switching to rails 5, we added migration version to all migration classes. This patch makes it possible to run versioned migrations also with rails 4
* \| \| \| \| \| \| \| \| \|	Merge branch 'mr-file-tree-commit' into 'master'	Filipa Lacerda	2018-11-22	10	-107/+58
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show toggle tree button on merge request commits Closes #53019 See merge request gitlab-org/gitlab-ce!23238
\| * \| \| \| \| \| \| \| \| \|	Show toggle tree button on merge request commits	Phil Hughes	2018-11-22	10	-107/+58
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53019
* \| \| \| \| \| \| \| \| \|	Merge branch 'gt-limit-gitlab-assets-compile-job-to-branches' into 'master'	Rémy Coutable	2018-11-22	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit `gitlab:assets:compile` job to branches and tags Closes #54361 See merge request gitlab-org/gitlab-ce!23302
\| * \| \| \| \| \| \| \| \| \|	Limit `gitlab:assets:compile` job to branches	George Tsiolis	2018-11-22	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-typos-occured' into 'master'	Kushal Pandya	2018-11-22	14	-55/+55
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos occured to occurred See merge request gitlab-org/gitlab-ce!23105
\| * \| \| \| \| \| \| \| \| \|	Update gitlab.pot	Hiroyuki Sato	2018-11-21	1	-32/+32
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into fix-typos-occured	Hiroyuki Sato	2018-11-21	1161	-8147/+7900
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: - app/assets/javascripts/ide/stores/modules/pipelines/actions.js - spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
\| * \| \| \| \| \| \| \| \| \| \|	Fix typos occured to occurred	Hiroyuki Sato	2018-11-16	14	-25/+25
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-11-22	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'54293-fetch-assets-job-times-out-so-package-and-qa-jobs-can-t-complete' into 'master' Resolve "`fetch-assets` job times out so `package-and-qa` jobs can't complete" Closes #54293 See merge request gitlab-org/gitlab-ce!23267
\| * \| \| \| \| \| \| \| \| \| \|	Pass GITLAB_REF_SLUG to the Omnibus triggers54293-fetch-assets-job-times-out-so-package-and-qa-jobs-can-t-complete	Rémy Coutable	2018-11-22	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-shibboleth-markdown' into 'master'	Achilleas Pipinellis	2018-11-22	1	-85/+85
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix markdown to render correctly See merge request gitlab-org/gitlab-ce!23221
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix markdown to render correctlydocs/fix-shibboleth-markdown	Evan Read	2018-11-20	1	-85/+85
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/delete-broken-link' into 'master'	Achilleas Pipinellis	2018-11-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove broken link that 404s and has no alternative See merge request gitlab-org/gitlab-ce!23295
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove broken link that 404s and has no alternativedocs/delete-broken-link	Evan Read	2018-11-22	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2018-11-22	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'46950-systemcheck-use-gem-ruby-instead-of-hardcoding-ruby-version' into 'master' SystemCheck: Use a more reliable way to detect current Ruby version Closes #46950 See merge request gitlab-org/gitlab-ce!23291
\| * \| \| \| \| \| \| \| \| \| \| \|	Use a more reliable way to detect current Ruby version46950-systemcheck-use-gem-ruby-instead-of-hardcoding-ruby-version 46950-systemcheck-ruby-version	Gabriel Mazetto	2018-11-21	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'revert-fd6e3781' into 'master'	Sean McGivern	2018-11-22	19	-1281/+785
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'revert-e2aa2177' into 'master'" Closes #54267 See merge request gitlab-org/gitlab-ce!23237
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where ID is not setrevert-fd6e3781	Zeger-Jan van de Weg	2018-11-20	3	-6/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On HEAD~ we remove the ID from the class, which created a bug. Given we don't need the ID anymore, it has been removed and simplified.