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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into 'url-utility-es-module'	Phil Hughes	2017-12-11	49	-272/+1260
\|\ \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/issue_show/components/app.vue
\| *	Fix image view mode	Clement Ho	2017-12-11	1	-0/+12
\| \|
\| *	Remove the need for destroy and add a comment in the spec	Stan Hu	2017-12-10	1	-4/+3
\| \|
\| *	Use build instead of create in importer spec	Stan Hu	2017-12-10	1	-1/+1
\| \|
\| *	Fix failing importer test case on MySQL due to missing trailing slash in ↵sh-fix-import-rake-task	Stan Hu	2017-12-08	2	-0/+11
\| \| \| \| \| \| \| \|	root path
\| *	Fix gitlab:import:repos Rake task moving repositories into the wrong location	Stan Hu	2017-12-08	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the source import directory were different from the destination directory, GitLab would first create a blank repository and then erroneously move the original one into a subdirectory. Adding an import type prevents this the project from being initialized in the first place. It was accidentally removed in 1f917cbd49. Closes #40765
\| *	Allow git pull/push on project redirects	Mayra Cabrera	2017-12-08	8	-31/+318
\| \|
\| *	Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'	Mike Greiling	2017-12-08	3	-3/+46
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Deploy markers should be more verbose" Closes #38032 See merge request gitlab-org/gitlab-ce!15641
\| \| *	Changed the deploy markers on the prometheus dashboard to be more verbose	Jose Ivan Vargas	2017-12-07	3	-3/+46
\| \| \|
\| * \|	Merge branch 'jprovazn-ignore-anchors' into 'master'	Sean McGivern	2017-12-08	2	-0/+16
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use prefix for TableOfContents filter hrefs Closes #38473 See merge request gitlab-org/gitlab-ce!15806
\| \| * \|	Use prefix for TableOfContents filter hrefs	Jan Provaznik	2017-12-08	2	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TableOfContents filter generates hrefs for each header in markdown, if the header text consists from digits and redacted symbols only, e.g. "123" or "1.0 then the auto-generated href has the same format as issue references. If the generated id contains only digits, then 'anchor-' prefix is prepended to the id. Closes #38473
\| * \| \|	Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'	Douwe Maan	2017-12-08	9	-37/+275
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalid pipeline build chain tag evaluation Closes #40944 See merge request gitlab-org/gitlab-ce!15805
\| \| * \| \|	Fix Rubocop	Kamil Trzcinski	2017-12-08	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Add Chain::Command specsfix/gb/fix-pipeline-build-chain-tag-evaluation	Kamil Trzcinski	2017-12-08	3	-9/+189
\| \| \| \| \|
\| \| * \| \|	Implement and use Gitlab::Ci::Pipeline::Chain::Command	Kamil Trzcinski	2017-12-08	7	-45/+50
\| \| \| \| \|
\| \| * \| \|	Fix invalid pipeline build chain tag evaluation	Grzegorz Bizon	2017-12-08	2	-2/+55
\| \| \| \| \|
\| * \| \| \|	Resolve "No feedback when checking on checklist if potential spam was detected"	Luke Bennett	2017-12-08	4	-5/+109
\| \| \| \| \|
\| * \| \| \|	Move the circuitbreaker check out in a separate processbvl-circuitbreaker-process	Bob Van Landuyt	2017-12-08	20	-196/+460
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running.
* \| \| \| \|	fix missed gl.utils.visitUrl spy	Phil Hughes	2017-12-08	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	remove utl util imports from boards specs	Phil Hughes	2017-12-08	3	-3/+0
\| \| \| \| \|
* \| \| \| \|	use exported methods instead of gl.utils	Phil Hughes	2017-12-08	16	-58/+66
\|/ / / /
* \| \| \|	Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'	Grzegorz Bizon	2017-12-08	1	-0/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix new personal access token showing up in a flash message Closes #40754 See merge request gitlab-org/gitlab-ce!15707
\| * \| \| \|	Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-token	Eric Eastwood	2017-12-07	1	-0/+25
\| \| \| \| \|
* \| \| \| \|	Merge branch 'jprovazn-testfix2' into 'master'	Stan Hu	2017-12-08	1	-5/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean test path between merge request handler tests Closes #40900 See merge request gitlab-org/gitlab-ce!15792
\| * \| \| \| \|	Clean test path between merge request handler testsjprovazn-testfix2	Jan Provaznik	2017-12-07	1	-5/+5
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	create_merge_request_handler_spec needs a repository for some tests but this repository lasts on disk by default which causes failures of other tests. TestEnv.clean_test_path is used to get rid of the repository after each test. Closes #40900
* \| \| \| \|	Merge branch '40825-use-relative-path-urls' into 'master'	Robert Speicher	2017-12-07	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative _path helper URLs in the GitLab UI Closes #40825 See merge request gitlab-org/gitlab-ce!15738
\| * \| \| \| \|	Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urls	Eric Eastwood	2017-12-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825
* \| \| \| \| \|	Merge branch 'acet-fix-branches-list-on-cherry-pick-modal-after-merge' into ↵	Jacob Schatz	2017-12-07	1	-0/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix loading branches list on cherry pick modal after merge. Closes #33894 See merge request gitlab-org/gitlab-ce!15306
\| * \| \| \| \| \|	Fix loading branches list on cherry pick modal after merge.acet-fix-branches-list-on-cherry-pick-modal-after-merge	Fatih Acet	2017-12-04	1	-0/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-transient-datefix-spec' into 'master'	Jacob Schatz	2017-12-07	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix transient error in pikadayToString Closes #40858 See merge request gitlab-org/gitlab-ce!15754
\| * \| \| \| \| \| \|	Fix transient error in pikadayToStringfix-transient-datefix-spec	Clement Ho	2017-12-05	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix_39233' into 'master'	Sean McGivern	2017-12-07	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #39233 - 500 in merge request Closes #39233 See merge request gitlab-org/gitlab-ce!15774
\| * \| \| \| \| \| \| \|	fix #39233 - 500 in merge request	Martin Nowak	2017-12-07	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- handle unchanged empty lines in inline diff
* \| \| \| \| \| \| \| \|	Merge branch 'feature/sm/34834-missing-dependency-should-fail-job-2' into ↵	Kamil Trzciński	2017-12-07	3	-1/+174
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Dependency validator Closes #34834 See merge request gitlab-org/gitlab-ce!14009
\| * \| \| \| \| \| \| \|	Test for both ci_disable_validates_dependencies true/false	Shinya Maeda	2017-12-08	2	-78/+129
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Change feature flag to ci_disable_validates_dependencies to enable it as default	Shinya Maeda	2017-12-07	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix pipeline	Shinya Maeda	2017-12-06	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix tests	Shinya Maeda	2017-12-06	2	-28/+32
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix /build_spec.rb	Shinya Maeda	2017-12-06	1	-1/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix lint	Shinya Maeda	2017-12-06	2	-4/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add case when artifacts have not existed on dependencies	Shinya Maeda	2017-12-06	2	-1/+45
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use Class.new(StandardError) instead of custom extended error class. Bring ↵	Shinya Maeda	2017-12-06	2	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	back specified_dependencies?.
\| * \| \| \| \| \| \| \|	Fail jobs if its dependency is missing	Shinya Maeda	2017-12-06	3	-0/+63
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'deploy-keys-loading-icon' into 'master'	Filipa Lacerda	2017-12-07	2	-1/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed remove deploy key loading icon not being removed after canceling Closes #37595 See merge request gitlab-org/gitlab-ce!15779
\| * \| \| \| \| \| \| \| \|	Fixed remove deploy key loading icon not being removed after cancelingdeploy-keys-loading-icon	Phil Hughes	2017-12-07	2	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #37595
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-12-07	4	-215/+46
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40761-remove-the-checkbox-for-starting-a-new-pipeline-in-auto-devops-settings' into 'master' Resolve "Remove the checkbox for starting a new pipeline in Auto DevOps settings" Closes #40761 See merge request gitlab-org/gitlab-ce!15714
\| * \| \| \| \| \| \| \| \|	Remove Auto DevOps checkboxes - frontend40761-remove-the-checkbox-for-starting-a-new-pipeline-in-auto-devops-settings	bikebilly	2017-12-04	1	-101/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove Auto DevOps checkboxes - backend	bikebilly	2017-12-04	3	-114/+46
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-commit-diff-discussions-in-mr-context' into 'master'	Douwe Maan	2017-12-07	13	-71/+216
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow commenting on individual commits inside an MR Closes #31847 See merge request gitlab-org/gitlab-ce!12148
\| * \| \| \| \| \| \| \| \| \|	adding view and feature specs	micael.bergeron	2017-12-07	10	-68/+173
\| \| \| \| \| \| \| \| \| \| \|