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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fixed-web-ide-merge-request-review' into 'master'	Kushal Pandya	2019-04-11	2	-0/+39
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixes Web IDE not loading merge request files Closes #60243 See merge request gitlab-org/gitlab-ce!27225
\| *	Fixes Web IDE not loading merge request files	Phil Hughes	2019-04-11	2	-0/+39
\| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60243
* \|	Merge branch 'revert-24704-download-repository-path' into 'master'	Rémy Coutable	2019-04-11	6	-33/+18
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '24704-download-repository-path' into 'master'" See merge request gitlab-org/gitlab-ce!27249
\| * \|	Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-path	Patrick Bajao	2019-04-11	6	-33/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.
* \| \|	Merge branch 'limit-amount-of-created-pipelines' into 'master'	Grzegorz Bizon	2019-04-11	1	-3/+39
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Process at most 4 pipelines during push See merge request gitlab-org/gitlab-ce!27205
\| * \| \|	Process at most 4 pipelines during pushlimit-amount-of-created-pipelines	Kamil Trzciński	2019-04-10	1	-3/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a limitation that we will try to create pipeline for at most 4 first changes (branches and tags). This does not affect processing of Pipelines for Merge Requests, as each updated MR will have associated pipeline created.
* \| \| \|	Merge branch ↵	Lin Jen-Shin	2019-04-11	2	-4/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-6120-extract-ee-specific-files-lines-for-spec-services-merge_requests' into 'master' [CE-port] Extract EE specific files/lines for spec/services/merge_requests See merge request gitlab-org/gitlab-ce!26977
\| * \| \| \|	Fix naming of testce-6120-extract-ee-specific-files-lines-for-spec-services-merge_requests	Heinrich Lee Yu	2019-04-11	2	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ALso makes it consistent with EE
* \| \| \| \|	Merge branch 'jc-guard-against-empty-dereferenced_target' into 'master'	Sean McGivern	2019-04-11	1	-0/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guard against nil dereferenced_target Closes #60076 See merge request gitlab-org/gitlab-ce!27192
\| * \| \| \| \|	Guard against nil dereferenced_targetjc-guard-against-empty-dereferenced_target	John Cai	2019-04-10	1	-0/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'winh-eslint-jest' into 'master'	Phil Hughes	2019-04-11	1	-5/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable eslint-plugin-jest for Jest Closes #59636 See merge request gitlab-org/gitlab-ce!26715
\| * \| \| \| \| \|	Replace individual ESLint rules with jest/recommendedwinh-eslint-jest	Winnie Hellmann	2019-04-10	1	-5/+2
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Delete static_fixtures.rb for static HAML fixtures	Winnie Hellmann	2019-04-11	3	-30/+15
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Align UrlValidator to validate_url gem implementation.	Thong Kuah	2019-04-11	6	-42/+146
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renamed UrlValidator to AddressableUrlValidator to avoid 'url:' naming collision with ActiveModel::Validations::UrlValidator in 'validates' statement. Make use of the options attribute of the parent class ActiveModel::EachValidator. Add more options: allow_nil, allow_blank, message. Renamed 'protocols' option to 'schemes' to match the option naming from UrlValidator.
* \| \| \| \|	Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"tz-revert-new-emojis-loading	Tim Zallmann	2019-04-10	3	-129/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reverts the loading of emojis and its images to move forward with RC
* \| \| \| \|	Merge branch 'ce-10834-support-fast-unit-tests-in-ee' into 'master'	Rémy Coutable	2019-04-10	2	-0/+6
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Resolve "Support fast unit tests in EE" See merge request gitlab-org/gitlab-ce!26861
\| * \| \| \|	Require possible EE extension	Lin Jen-Shin	2019-04-10	2	-0/+6
\| \|/ / /
* \| \| \|	Quarantine flaky specsquarantine-flaky-specs	Rémy Coutable	2019-04-10	4	-4/+4
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'winh-jest-valid-describe' into 'master'	Kushal Pandya	2019-04-10	6	-12/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable ESLint rule jest/valid-describe See merge request gitlab-org/gitlab-ce!27140
\| * \| \|	Wrap modal mutation names in template stringswinh-jest-valid-describe	Winnie Hellmann	2019-04-10	1	-3/+3
\| \| \| \|
\| * \| \|	Hard code test name in timeline_entry_item_spec.js	Winnie Hellmann	2019-04-10	1	-1/+1
\| \| \| \|
\| * \| \|	Hard code test name in suggestion_diff_row_spec.js	Winnie Hellmann	2019-04-10	1	-1/+1
\| \| \| \|
\| * \| \|	Wrap import project mutation names in template strings	Winnie Hellmann	2019-04-10	1	-2/+2
\| \| \| \|
\| * \| \|	Wrap file template mutation names in template strings	Winnie Hellmann	2019-04-10	1	-5/+5
\| \| \| \|
\| * \| \|	Enable ESLint rule jest/valid-describe	Winnie Hellmann	2019-04-10	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch '6623-extract-ee-specific-files-lines-for-ci-spec-serializers' ↵	Yorick Peterse	2019-04-10	1	-2/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Extract EE specific files/lines for CI spec/serializers" See merge request gitlab-org/gitlab-ce!27214
\| * \| \| \|	Use different query count expectations in EE6623-extract-ee-specific-files-lines-for-ci-spec-serializers	Matija Čupić	2019-04-10	1	-2/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch '6073-extract-ee-specific-files-lines-for-some-ci-files' into ↵	Yorick Peterse	2019-04-10	1	-3/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Extract EE specific files/lines for some CI files" Closes gitlab-ee#6073 See merge request gitlab-org/gitlab-ce!27210
\| * \| \| \|	Add optional IGNORE_ACCESSORS in RetryBuildService6073-extract-ee-specific-files-lines-for-some-ci-files	Matija Čupić	2019-04-10	1	-3/+5
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Add time tracking to issue board entities	pataar	2019-04-10	1	-0/+3
\| \|/ / \|/\| \|
* \| \|	Merge branch 'increase-rspec-retries' into 'master'	Rémy Coutable	2019-04-10	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Double retries for rspec-retries See merge request gitlab-org/gitlab-ce!27208
\| * \| \|	Double retries for rspec-retries	Lin Jen-Shin	2019-04-10	1	-2/+2
\| \|/ / \| \| \| \| \| \| \| \| \|	It was 2*4 => 8 times before, so 4 times is still half retries
* \| \|	Merge branch 'quarantine-flaky-specs' into 'master'	Kamil Trzciński	2019-04-10	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Quarantine a flaky spec in spec/features/issues/user_creates_branch_and_merge_request_spec.rb See merge request gitlab-org/gitlab-ce!27202
\| * \|	Quarantine a flaky spec in ↵	Rémy Coutable	2019-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec/features/issues/user_creates_branch_and_merge_request_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch '47327-fix-github-project-import-visibility' into 'master'	Douwe Maan	2019-04-10	1	-3/+13
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Fix GitHub project import visibility See merge request gitlab-org/gitlab-ce!27133
\| * \|	Address style review comment	Daniel Wyatt	2019-04-09	1	-2/+0
\| \| \|
\| * \|	Add test for github project import to user namespace.	Daniel Wyatt	2019-04-09	1	-0/+12
\| \| \|
\| * \|	Fix GitHub project import visibility	Daniel Wyatt	2019-04-08	1	-2/+2
\| \| \|
* \| \|	Merge branch 'revert-2cc01f12' into 'master'	Rémy Coutable	2019-04-10	1	-48/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'sh-optimize-projects-api' into 'master'" Closes #60315 See merge request gitlab-org/gitlab-ce!27195
\| * \| \|	Revert "Merge branch 'sh-optimize-projects-api' into 'master'"revert-2cc01f12	Stan Hu	2019-04-10	1	-48/+1
\| \| \|/ \| \|/\| \| \| \|	This reverts merge request !26481
* \| \|	Add more info logging to cluster apps	Dylan Griffith	2019-04-10	2	-1/+28
\|/ / \| \| \| \| \| \| \| \|	Log events so that it's easy to see when different requests are starting.
* \|	Merge branch '60305-fix-mr-assignee-for-mr-push-options' into 'master'	Douglas Barbosa Alexandre	2019-04-09	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR assignees for push options Closes #60305 See merge request gitlab-org/gitlab-ce!27186
\| * \|	Fix MR assignees for push options	Nick Thomas	2019-04-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With multiple MR assignees, `merge_request.assignee_id` is always nil, and `merge_request.assignee_ids` isn't in `merge_request.attributes`. So the existing code doesn't set assignees in the created MR. This fix gets all the tests passing, but we should also check that no other associations in the MergeRequest need similar fixups.
* \| \|	Quarantine flaky test	Michael Kozono	2019-04-09	1	-1/+1
\|/ /
* \|	Mark unverified pages domains for removal	Vladimir Shushlin	2019-04-09	3	-21/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set pages_domain.remove_at when disabling it Add specs for marking pages domain for removal Notify user that domain is being removed Add documentation
* \|	Merge branch 'quarantine-flaky-specs' into 'master'	Kamil Trzciński	2019-04-09	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine a flaky spec in spec/features/issues/user_interacts_with_awards_spec.rb See merge request gitlab-org/gitlab-ce!27176
\| * \|	Quarantine a flaky spec in ↵	Rémy Coutable	2019-04-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec/features/issues/user_interacts_with_awards_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Move Contribution Analytics related spec in ↵	Imre Farkas	2019-04-09	64	-22/+2206
\| \| \| \| \| \| \| \| \| \| \| \|	spec/features/groups/group_page_with_external_authorization_service_spec to EE
* \| \|	Merge branch 'osw-multi-assignees-merge-requests' into 'master'	Nick Thomas	2019-04-09	58	-408/+810
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	[Backport] Support multiple assignees for merge requests See merge request gitlab-org/gitlab-ce!27089
\| * \|	[CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requests	Oswaldo Ferreira	2019-04-08	58	-408/+810
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).