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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove extra ending line from unicorn example filebw-unicorn-extra-line	Brett Walker	2019-05-16	1	-1/+0
\|
*	Merge branch 'sh-bump-gitlab-shell-9.2.0' into 'master'	Douglas Barbosa Alexandre	2019-05-16	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Upgrade gitlab-shell to 9.2.0 See merge request gitlab-org/gitlab-ce!28372
\| *	Upgrade gitlab-shell to 9.2.0	Stan Hu	2019-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Main change is to bump .ruby-version to 2.6.3 so versions are consistent for the GDK.
* \|	Merge branch 'haml-lint-fe' into 'master'	Douglas Barbosa Alexandre	2019-05-16	1	-0/+2
\|\ \ \| \|/ \|/\| \| \| \| \|	Add haml-lint.yml to FE for roulette See merge request gitlab-org/gitlab-ce!28301
\| *	Add haml-lint.yml to FE for roulettehaml-lint-fe	Luke Bennett	2019-05-13	1	-0/+2
\| \|
* \|	Merge branch 'admin-user-access-levels-scb' into 'master'	Phil Hughes	2019-05-16	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in admin user access levels Closes gitlab-ee#10507 See merge request gitlab-org/gitlab-ce!28359
\| * \|	Resolve CE/EE diffs in admin user access levelsadmin-user-access-levels-scb	Luke Bennett	2019-05-16	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \|	Merge branch 'mirror-repos-scb' into 'master'	Phil Hughes	2019-05-16	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in mirror repos settings Closes gitlab-ee#11036 See merge request gitlab-org/gitlab-ce!28361
\| * \| \|	Resolve CE/EE diffs in mirror repos settingsmirror-repos-scb	Luke Bennett	2019-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \|	Merge branch 'docs-render_if_exists-opts-caveat' into 'master'	Phil Hughes	2019-05-16	1	-1/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain render_if_exists opts caveat See merge request gitlab-org/gitlab-ce!28366
\| * \| \| \|	Explain render_if_exists opts caveatdocs-render_if_exists-opts-caveat	Luke Bennett	2019-05-16	1	-1/+13
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-what-to-do-if-review-jobs-keep-failing' into 'master'	Sean McGivern	2019-05-16	1	-6/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document what to do if review jobs keep failing See merge request gitlab-org/gitlab-ce!28367
\| * \| \| \| \|	Document what to do if review jobs keep failing	Rémy Coutable	2019-05-16	1	-6/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'ce-2087-make-num-shards-configurable' into 'master'	Sean McGivern	2019-05-16	3	-1/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of "Configure the number of ES shards and replicas" See merge request gitlab-org/gitlab-ce!28329
\| * \| \| \| \| \|	CE backport of "Configure the number of ES shards and replicas"	Nick Thomas	2019-05-16	3	-1/+15
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jc-omit-count-diverging-commits-max' into 'master'	Lin Jen-Shin	2019-05-16	4	-4/+63
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Omit max-count for diverging_commit_counts behind feature flag See merge request gitlab-org/gitlab-ce!28157
\| * \| \| \| \| \|	Omit max-count for diverging_commit_counts behind feature flagjc-omit-count-diverging-commits-max	John Cai	2019-05-14	4	-4/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to optimize the query for the CountDivergingCommits rpc by removing the --max-count argument now that we have commit graphs enabled for all repositories during housekeeping. However, we want to test this first behind a feature flag.
* \| \| \| \| \| \|	Merge branch 'diff-filter-bar-placeholder-text' into 'master'	Filipa Lacerda	2019-05-16	2	-2/+9
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed the placeholder text of the diff tree filter input Closes #58339 See merge request gitlab-org/gitlab-ce!28352
\| * \| \| \| \| \|	Changed the placeholder text of the diff tree filter input	Phil Hughes	2019-05-16	2	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58339
* \| \| \| \| \| \|	Merge branch 'disallow-review-deploy-to-fail' into 'master'	Sean McGivern	2019-05-16	1	-3/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow the review-deploy and review-qa-smoke jobs to fail See merge request gitlab-org/gitlab-ce!28314
\| * \| \| \| \| \| \|	Disallow the review-deploy and review-qa-smoke jobs to faildisallow-review-deploy-to-fail	Rémy Coutable	2019-05-15	1	-3/+2
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'reg-captcha-flag' into 'master'	Nick Thomas	2019-05-16	3	-14/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add :registrations_recaptcha feature flag Closes gitlab-ee#11389 See merge request gitlab-org/gitlab-ce!28296
\| * \| \| \| \| \| \|	Add :registrations_recaptcha feature flag	Luke Bennett	2019-05-16	3	-14/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows instance owners to toggle the recaptcha requirement on the user registration page by feature flag. Allows GitLab Growth team to measure reCAPTCHA's impact on registrations.
* \| \| \| \| \| \| \|	Merge branch 'fix_failure_migrate_on_mysql8' into 'master'	Stan Hu	2019-05-16	2	-1/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix. db:migrate is failed on MySQL 8 See merge request gitlab-org/gitlab-ce!28351
\| * \| \| \| \| \| \| \|	Fix. db:migrate is failed on MySQL 8	sue445	2019-05-16	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	``` StandardError: An error has occurred, all later migrations canceled: Mysql2::Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'system = true AND note LIKE '\_%\_'' at line 1: UPDATE notes SET note = trim(both '_' from note) WHERE system = true AND note LIKE '\_%\_' ```
* \| \| \| \| \| \| \| \|	Merge branch '49915-fix-error-500-admin-projects-nil-storage' into 'master'	Stan Hu	2019-05-16	7	-5/+64
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Error 500 viewing admin/projects page: undefined method `storage_size' for nil:NilClass" Closes #49915 See merge request gitlab-org/gitlab-ce!28355
\| * \| \| \| \| \| \| \| \|	Fix an error in projects admin when statistics are missing	Rémy Coutable	2019-05-16	7	-5/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-render_if_exists-relative-path' into 'master'	Phil Hughes	2019-05-16	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain `render_if_exists` relative path See merge request gitlab-org/gitlab-ce!28356
\| * \| \| \| \| \| \| \| \| \|	Explain `render_if_exists` relative path	Luke Bennett	2019-05-16	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'flash-messages-scb' into 'master'	Phil Hughes	2019-05-16	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in _flash_messages Closes gitlab-ee#11037 See merge request gitlab-org/gitlab-ce!28333
\| * \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in _flash_messagesflash-messages-scb	Luke Bennett	2019-05-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-update-rubocop-and-gitlab-styles-ce' into 'master'	Rémy Coutable	2019-05-16	3	-20/+20
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Rubocop to 0.69.0 and other gems See merge request gitlab-org/gitlab-ce!28345
\| * \| \| \| \| \| \| \| \| \|	Fix Style/NegatedUnless offenses in HAML filesh-update-rubocop-and-gitlab-styles-ce	Rémy Coutable	2019-05-16	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \|	Update Rubocop to 0.69.0 and other gems	Stan Hu	2019-05-15	2	-16/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes Ruby 2.6.x parser warnings: https://github.com/rubocop-hq/rubocop/pull/7009
* \| \| \| \| \| \| \| \| \| \|	Merge branch '59838-blocks' into 'master'	Phil Hughes	2019-05-16	3	-14/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes style-lint issues for blocks.scss Closes #59838 See merge request gitlab-org/gitlab-ce!28251
\| * \| \| \| \| \| \| \| \| \| \|	Fixes stylelint issues for blocks.scss59838-blocks	Filipa Lacerda	2019-05-10	3	-14/+8
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '19569-include-information-if-issue-was-closed-via-mr' into ↵	Rémy Coutable	2019-05-16	11	-22/+126
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Include MR information if possible when emailing notification of closing an issue Closes #19569 See merge request gitlab-org/gitlab-ce!15610
\| * \| \| \| \| \| \| \| \| \| \| \|	Include MR information if possible when emailing notification of closing an ↵	Michał Zając	2019-05-16	11	-22/+126
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ce-11621-fix-broken-master' into 'master'	Rémy Coutable	2019-05-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of "Fix a broken spec for EE" See merge request gitlab-org/gitlab-ce!28357
\| * \| \| \| \| \| \| \| \| \| \|	Fix a broken spec for EEce-11621-fix-broken-master	Nick Thomas	2019-05-16	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'diff-whitespace-setting-changes' into 'master'	Filipa Lacerda	2019-05-16	4	-6/+50
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issues with show whitespace button in diffs Closes #42597 and #58852 See merge request gitlab-org/gitlab-ce!28242
\| * \| \| \| \| \| \| \| \| \|	Fixes issues with show whitespace button in diffs	Phil Hughes	2019-05-10	4	-6/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly updates the URL without overwriting parameters Reloads the diff file content without reloading the page Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58852, https://gitlab.com/gitlab-org/gitlab-ce/issues/42597
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'acme-module' into 'master'	Nick Thomas	2019-05-16	13	-4/+337
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Let's Encrypt client See merge request gitlab-org/gitlab-ce!27624
\| * \| \| \| \| \| \| \| \| \| \|	Add Let's Encrypt client	Vladimir Shushlin	2019-05-16	13	-4/+337
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of adding Let's Encrypt certificates for pages domains Add acme-client gem Client is being initialized by private key stored in secrets.yml Let's Encrypt account is being created lazily. If it's already created, Acme::Client just gets account_kid by calling new_account method Make Let's Encrypt client an instance Wrap order and challenge classes
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-rebase-error-clearing' into 'master'	Nick Thomas	2019-05-16	3	-2/+33
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly clear the merge error upon rebase failure Closes #56139 See merge request gitlab-org/gitlab-ce!28319
\| * \| \| \| \| \| \| \| \| \| \|	Properly clear the merge error upon rebase failuresh-fix-rebase-error-clearing	Stan Hu	2019-05-15	3	-2/+33
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If `merge_error` is ever set after a failure, it is never cleared, even after a subsequent, successful rebase. We now clear this field whenever a successful rebase occurs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56139
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'js-i18n-i' into 'master'	Filipa Lacerda	2019-05-16	5	-9/+31
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n JS files starting with i See merge request gitlab-org/gitlab-ce!28010
\| * \| \| \| \| \| \| \| \| \|	I18N JS files starting with ijs-i18n-i	Brandon Labuschagne	2019-05-07	5	-9/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'help-scb' into 'master'	Phil Hughes	2019-05-16	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in help/index Closes gitlab-ee#11051 See merge request gitlab-org/gitlab-ce!28335
\| * \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in help/indexhelp-scb	Luke Bennett	2019-05-15	1	-2/+1
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.