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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add readme button to non-empty project page	Imre Farkas	2018-07-03	1	-1/+59
\|
*	Merge branch 'temporarily-remove-mr-diffs-migration' into 'master'	Alessio Caiazza	2018-07-03	2	-49/+1
\|\ \| \| \| \| \| \| \| \|	Temporarily remove MR diffs removal migration See merge request gitlab-org/gitlab-ce!20330
\| *	Temporarily remove MR diffs removal migration	Sean McGivern	2018-07-03	2	-49/+1
\| \| \| \| \| \| \| \|	We will re-add this with a more efficient bulk scheduling method.
* \|	Merge branch '36907-fix-new-issue-link-from-failed-job' into 'master'	Grzegorz Bizon	2018-07-03	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request gitlab-org/gitlab-ce!20328
\| *	Fix link to job when creating a new issue from a failed job	Rémy Coutable	2018-07-03	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'sh-fix-bamboo-change-set' into 'master'	Rémy Coutable	2018-07-03	1	-2/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Bamboo CI status not showing for branch plans Closes #1355 See merge request gitlab-org/gitlab-ce!20277
\| * \|	Fix Bamboo CI status not showing for branch plans	Stan Hu	2018-06-29	1	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The original API that queries by label (`/rest/api/latest/result?label=#{sha1}`) only works for results from main plans and not branch plans. The `/rest/api/latest/result/byChangeset/#{sha1}` endpoint gives results from branch plans but not for the first push to the branch. Subsequent pushes work. For more details, see https://jira.atlassian.com/browse/BAM-16121. Closes #1355
* \| \|	Make OperationService RPC's mandatory	Jacob Vosmaer (GitLab)	2018-07-03	6	-309/+114
\| \| \|
* \| \|	Merge branch 'fix-gitaly-mr-creation-limits' into 'master'	Douwe Maan	2018-07-03	2	-2/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR diffs created with gitaly_diff_between enabled Closes gitaly#1256 See merge request gitlab-org/gitlab-ce!20300
\| * \| \|	Fix MR diffs created with gitaly_diff_between enabled	Sean McGivern	2018-06-29	2	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we save merge request diffs to the database, we need to expand the diff before doing so. That's so that we can expand diffs (within the normal limits) without hitting the repository, but just by going to the database. This is done implicitly - diffs are expanded unless we say otherwise. However, we have another option we can pass, that lets us enforce diff size limits, that defaults to true. Prior to this commit: - The Rugged code path defaulted to setting `expanded: true` and `enforce_limits: true`. - The Gitaly code path defaulted to setting `expanded: false` and `enforce_limits: true`. This was introduced by eb36fa17a6ae5cda8950904b5a52e6aa365ae591, which implemented the initial feature. Since then, if the `gitaly_diff_between` feature flag was enabled, MRs would have diffs that could not be expanded in some cases, with no fix other than to disable the feature flag and force push to the MR to refresh the diff in the database.
* \| \| \|	Merge branch 'prune-web-hook-logs' into 'master'	Douwe Maan	2018-07-03	1	-0/+22
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prune web hook logs older than one month Closes #46120 See merge request gitlab-org/gitlab-ce!20183
\| * \| \|	Prune web hook logs older than 90 days	Yorick Peterse	2018-07-02	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a recurring Sidekiq job that removes up to 50 000 old web hook logs per hour, if they are older than 90 days. This will prevent the web_hook_logs table from growing indefinitely. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/46120
* \| \| \|	Merge branch 'jprovazn-extra-line' into 'master'	Sean McGivern	2018-07-03	1	-0/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't add bottom 'match' line for deleted files Closes #48160 See merge request gitlab-org/gitlab-ce!20255
\| * \| \| \|	Don't add bottom 'match' line for deleted files	Jan Provaznik	2018-06-28	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a file is deleted, its new_pos is 0 (less than total_blob_lines), but there is no reason to add the bottom 'match' line in this case because there is not extra content which could be expanded.
* \| \| \| \|	Merge branch 'add-title-placeholder-for-new-issues' into 'master'	Annabel Gray	2018-07-02	1	-0/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add title placeholder for new issues Closes #48085 See merge request gitlab-org/gitlab-ce!20271
\| * \| \| \| \|	Update create issue test to check for input placeholders	George Tsiolis	2018-06-29	1	-0/+3
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch ↵	Nick Thomas	2018-07-02	1	-16/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'6195-http-git-push-to-secondary-for-git-lfs-currently-does-not-work' into 'master' Prep work to support git/git-lfs redirect to primary See merge request gitlab-org/gitlab-ce!19728
\| * \| \| \| \|	Better route matching for read-only detection	Ash McKenzie	2018-07-02	1	-16/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ce-backport-5605-epic-autocomplete' into 'master'	Phil Hughes	2018-07-02	5	-10/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport: Add support for autocompleting Epics within Issues & MRs and Labels within Epics See merge request gitlab-org/gitlab-ce!20238
\| * \| \| \| \| \|	Update tests to check emoji autocompletion	Kushal Pandya	2018-07-02	5	-10/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '48653-mr-target-branch-missing' into 'master'	Sean McGivern	2018-07-02	1	-0/+16
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix notify_conflict? raising exception due to absent branches Closes #48653 See merge request gitlab-org/gitlab-ce!20280
\| * \| \| \| \| \|	Fix notify_conflict? raising exception when branches do not exist	Mark Chao	2018-07-02	1	-0/+16
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	repository.can_be_merged? can raise error if diff_head_sha or target_branch are absent, therefore check those explicitly.
* \| \| \| \| \|	Merge branch '39543-milestone-page-list-redesign' into 'master'	Fatih Acet	2018-07-02	3	-14/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Milestone page list redesign" Closes #39543 See merge request gitlab-org/gitlab-ce!19832
\| * \| \| \| \|	Updated test for promoted milestones success message	Constance Okoghenun	2018-06-21	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Constance Okoghenun	2018-06-21	222	-1920/+5395
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	39543-milestone-page-list-redesign
\| * \| \| \| \| \|	Updated test for user deleting a milestone	Constance Okoghenun	2018-06-19	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Removed irrelevant test for edit milestone in milestone list	Constance Okoghenun	2018-06-19	1	-13/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '43270-import-with-milestones-failing' into 'master'	Douwe Maan	2018-07-02	4	-22/+200
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Import with Milestones Failing" Closes #43270 and #47626 See merge request gitlab-org/gitlab-ce!19961
\| * \| \| \| \| \| \|	update code based on feedback	James Lopez	2018-06-27	1	-14/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix spec	James Lopez	2018-06-22	1	-3/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix spec	James Lopez	2018-06-22	1	-2/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add more specs and refactor more relation factory code	James Lopez	2018-06-22	2	-0/+107
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	refactor code based on feedback	James Lopez	2018-06-22	2	-70/+52
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	refactor code once again to fix IID issues	James Lopez	2018-06-20	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	refactor code once again to fix IID issues	James Lopez	2018-06-20	1	-14/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix some more edge cases	James Lopez	2018-06-20	1	-16/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix some edge cases	James Lopez	2018-06-19	1	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	update spec	James Lopez	2018-06-19	1	-6/+55
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add group finder spec and logic	James Lopez	2018-06-19	1	-0/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add spec replicating both label and milestone duplicated title issues	James Lopez	2018-06-18	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add spec replicating both label and milestone duplicated title issues	James Lopez	2018-06-18	2	-5/+38
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/gb/make-root-ref-default-instead-of-head' into 'master'	Douwe Maan	2018-07-02	1	-0/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use root ref instead of HEAD to find latest repository commit Closes gitlab-ee#5864 See merge request gitlab-org/gitlab-ce!20258
\| * \| \| \| \| \| \| \|	Add simple test for a default repository commit ref	Grzegorz Bizon	2018-06-29	1	-0/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '44726-cancel_lease_upon_completion_in_project_cache_worker' ↵	Sean McGivern	2018-07-02	1	-31/+42
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Cancel ExclusiveLease upon completion in ProjectCacheWorker Closes #44726 See merge request gitlab-org/gitlab-ce!20103
\| * \| \| \| \| \| \| \| \|	Cancel ExclusiveLease upon completion in ProjectCacheWorker	Imre Farkas	2018-06-30	1	-31/+42
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Resolve "404 when trying to create a new issue from the group"	Jan Beckmann	2018-07-02	4	-9/+62
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '44725-expire_correct_methods_after_change_head' into 'master'	Grzegorz Bizon	2018-07-02	2	-11/+29
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expire correct method caches after HEAD changed Closes #44725 See merge request gitlab-org/gitlab-ce!20102
\| * \| \| \| \| \| \| \| \|	Expire correct method caches after HEAD changed	Imre Farkas	2018-06-29	2	-11/+29
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ccr/add_locked_state' into 'master'	Rémy Coutable	2018-07-01	3	-15/+32
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add locked state to merge request API See merge request gitlab-org/gitlab-ce!20186
\| * \| \| \| \| \| \| \| \| \|	Add locked state to merge request API	Chantal Rollison	2018-06-28	3	-15/+32
\| \| \| \| \| \| \| \| \| \| \|