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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use shared interceptor in note specs37619-fix-vue-typeerror-not-failing-the-build	Eric Eastwood	2017-12-11	2	-205/+215
\|
*	Try to clean up legit Vue error that was patched over	Eric Eastwood	2017-12-10	2	-22/+91
\| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859
*	Add Vue errorHandlor to remove rogue logged TypeErrors	Eric Eastwood	2017-12-10	1	-1/+11
\| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859
*	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.
*	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
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add support for the commit reference filter	micael.bergeron	2017-12-07	4	-12/+28
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	corrects the url building	micael.bergeron	2017-12-07	1	-2/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	diff notes created in merge request on a commit have the right context	micael.bergeron	2017-12-07	1	-0/+15
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add a spec for commit merge request diff notes
* \| \| \| \| \| \| \| \|	Remove Rugged::Repository#empty?	Zeger-Jan van de Weg	2017-12-07	8	-129/+96
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'jej/per-user-protected-branches-api-ce' into 'master'	Sean McGivern	2017-12-07	1	-18/+18
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of "ProtectedBranches API handles per user/group granularity" See merge request gitlab-org/gitlab-ce!15747
\| * \| \| \| \| \| \| \|	CE backport of ProtectedBranches API changes	James Edwards-Jones	2017-12-07	1	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In EE we now allow individual users/groups to be set on POST, which required some refactoring. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3516
* \| \| \| \| \| \| \| \|	Merge branch 'ce-backport-3615' into 'master'	Sean McGivern	2017-12-07	6	-30/+100
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor banzai to support referencing from group context See merge request gitlab-org/gitlab-ce!15766
\| * \| \| \| \| \| \| \| \|	Refactor banzai to support referencing from group contextce-backport-3615	Jarka Kadlecova	2017-12-06	6	-30/+100
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Support uploads for groups	Jarka Kadlecova	2017-12-07	7	-255/+336
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '40573-rename-gke-as-kubernetes-engine' into 'master'	Kamil Trzciński	2017-12-07	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename GKE as Kubernetes Engine Closes #40537 See merge request gitlab-org/gitlab-ce!15608
\| * \| \| \| \| \| \| \| \|	Rename GKE as Kubernetes Engine	Takuya Noguchi	2017-12-06	2	-4/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Resolve "Display member role per project"	Mike Greiling	2017-12-07	1	-0/+159
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	The API isn't using the appropriate services for managing forks	Francisco Javier López	2017-12-07	1	-155/+198
\| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mk-add-old-attachments-to-uploads-table' into 'master'	Stan Hu	2017-12-07	6	-1/+824
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add old files to uploads table See merge request gitlab-org/gitlab-ce!15270
\| * \| \| \| \| \| \| \| \|	Fix specs for MySQL	Michael Kozono	2017-12-06	2	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix specs after rebase	Michael Kozono	2017-12-06	4	-89/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Later migrations added fields to the EE DB which were used by factories which were used in these specs. And in CE on MySQL, a single appearance row is enforced. The migration and migration specs should not depend on the codebase staying the same.
\| * \| \| \| \| \| \| \| \|	Process normal paths in batch containing bad paths	Michael Kozono	2017-12-05	1	-0/+20
\| \| \| \| \| \| \| \| \| \|