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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix import order lintpsimyn-vue-shared-note	Simon Knox	2017-11-30	12	-20/+20
\|
*	remove notes entrypoint	Simon Knox	2017-11-30	3	-3/+2
\|
*	move notes app to vue_shared	Simon Knox	2017-11-30	48	-109/+112
\|
*	rename remaining issue_note components	Simon Knox	2017-11-30	10	-18/+17
\|
*	rename notes_app	Simon Knox	2017-11-30	3	-7/+7
\|
*	Merge branch 'psimyn-issue-note-refac' into psimyn-mr-note	Simon Knox	2017-11-30	193	-842/+3791
\|\
\| *	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Simon Knox	2017-11-29	172	-762/+3712
\| \|\ \| \| \| \| \| \| \| \| \|	psimyn-issue-note-refac
\| \| *	Merge branch 'backport-border-inline-edit' into 'master'	Fatih Acet	2017-11-29	6	-13/+20
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport - Add border for epic edit button See merge request gitlab-org/gitlab-ce!15637
\| \| \| *	Backport border inline editbackport-border-inline-edit	Clement Ho	2017-11-28	6	-13/+20
\| \| \| \|
\| \| * \|	Merge branch 'backport-epic-tasklist' into 'master'	Fatih Acet	2017-11-29	6	-42/+86
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport epic tasklist See merge request gitlab-org/gitlab-ce!15556
\| \| \| * \|	Backport epic tasklist	Clement Ho	2017-11-29	6	-42/+86
\| \| \|/ /
\| \| * \|	Merge branch 'an/gitaly-timeouts' into 'master'	Rémy Coutable	2017-11-29	13	-24/+231
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add timeouts for Gitaly calls Closes gitaly#656 See merge request gitlab-org/gitlab-ce!15047
\| \| \| * \|	Add timeouts for Gitaly calls	Andrew Newdigate	2017-11-29	13	-24/+231
\| \| \|/ /
\| \| * \|	Merge branch 'dm-search-pattern' into 'master'	Sean McGivern	2017-11-29	17	-85/+84
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use fuzzy search with minimum length of 3 characters where appropriate Closes #40512 See merge request gitlab-org/gitlab-ce!15592
\| \| \| * \|	Use fuzzy search with minimum length of 3 characters where appropriatedm-search-pattern	Douwe Maan	2017-11-27	14	-54/+39
\| \| \| \| \|
\| \| \| * \|	Modify fuzzy_arel_match to search for equality when a term shorter than 3 ↵	Douwe Maan	2017-11-27	2	-7/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	characters is provided
\| \| \| * \|	Rename to_fuzzy_arel to fuzzy_arel_match	Douwe Maan	2017-11-24	3	-10/+10
\| \| \| \| \|
\| \| \| * \|	Use Gitlab::SQL::Pattern where appropriate	Douwe Maan	2017-11-24	8	-25/+16
\| \| \| \| \|
\| \| * \| \|	Merge branch 'remove-empty-scss-file' into 'master'	Phil Hughes	2017-11-29	1	-0/+0
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove empty new-nav.scss See merge request gitlab-org/gitlab-ce!15619
\| \| \| * \| \|	Remove empty new-nav.scssremove-empty-scss-file	Annabel Dunstone Gray	2017-11-27	1	-0/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'fix_invalid_new_pipeline_form' into 'master'	Filipa Lacerda	2017-11-29	3	-0/+18
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	initializes the branches dropdown upon invalid entry Closes #40012 See merge request gitlab-org/gitlab-ce!15588
\| \| \| * \| \| \|	initializes the branches dropdown upon invalid entry	Christiaan Van den Poel	2017-11-27	3	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Changelog added feature spec
\| \| * \| \| \| \|	Merge branch '40638-star-icon' into 'master'	Clement Ho	2017-11-28	1	-8/+1
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix star icon color/stroke Closes #40638 See merge request gitlab-org/gitlab-ce!15636
\| \| \| * \| \| \| \|	Fix star icon color/stroke	Annabel Dunstone Gray	2017-11-28	1	-8/+1
\| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \|
\| \| * \| \| \| \|	Merge branch 'be-wary-of-typos' into 'master'	Stan Hu	2017-11-28	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I am certainly weary of debugging sidekiq but I don't think that's what was meant See merge request gitlab-org/gitlab-ce!15635
\| \| \| * \| \| \| \|	I am certainly weary of debugging sidekiq but I don't think that's what was ↵be-wary-of-typos	Greg Stark	2017-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	meant
\| \| * \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-11-28	21	-163/+558
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settings' into 'master' Add checkbox to automatically run a pipeline when Auto DevOps is turned on in project settings Closes #38962 See merge request gitlab-org/gitlab-ce!15380
\| \| \| * \| \| \| \|	Add checkboxes to automatically run AutoDevops pipeline	Eric Eastwood	2017-11-28	12	-30/+187
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962
\| \| \| * \| \| \| \|	BE for automatic pipeline when enabling Auto DevOps	Matija Čupić	2017-11-28	10	-133/+371
\| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962
\| \| * \| \| \| \|	Merge branch '40373-fix-issue-note-submit-disabled-on-paste' into 'master'	Clement Ho	2017-11-28	2	-1/+7
\| \| \|\ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Issue comment submit button disabled on GFM paste Closes #40373 See merge request gitlab-org/gitlab-ce!15530
\| \| \| * \| \| \|	Fix issue comment submit button disabled on GFM paste	Eric Eastwood	2017-11-28	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40373 When copying some text from another note and paste, it goes through `copy_as_gfm` `paste` handler that calls `e.preventDefault()` which stops things. But then when inserting the text, we manually trigger an `input` event with jQuery which doesn't seem to be picked up by Vue `v-model`. Using copy/paste trick from https://stackoverflow.com/a/41046276/796832
\| \| * \| \| \| \|	Merge branch '40459-svg-icon-fix' into 'master'	Annabel Dunstone Gray	2017-11-28	8	-60/+69
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Issue note icons wrong color" Closes #40459 See merge request gitlab-org/gitlab-ce!15561
\| \| \| * \| \| \| \|	override a:focus styles. fix Commit page pipeline icon40459-svg-icon-fix	Simon Knox	2017-11-23	3	-9/+17
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	readd missing text-primary. remove unused svg styles	Simon Knox	2017-11-23	2	-6/+5
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	fix some icon colors. move text-color styles to common.scss	Simon Knox	2017-11-23	6	-52/+54
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-11-28	9	-21/+99
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name' into 'master' Resolve "Merge request generates wrong diff when branch and tag have the same name" Closes #40530 See merge request gitlab-org/gitlab-ce!15591
\| \| \| * \| \| \| \| \|	Ensure MRs always use branch refs for comparison	Sean McGivern	2017-11-28	9	-21/+99
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison.
\| \| * \| \| \| \| \| \|	Merge branch 'rs-fix-gemfile-lock' into 'master'	Yorick Peterse	2017-11-28	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lock seed-fu at the correct version in Gemfile.lock See merge request gitlab-org/gitlab-ce!15631
\| \| \| * \| \| \| \| \|	Lock seed-fu at the correct version in Gemfile.lock	Robert Speicher	2017-11-28	1	-1/+1
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \|	Merge branch 'zj-controller-action-gitaly-metrics' into 'master'	Rémy Coutable	2017-11-28	1	-7/+42
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add controller#action metrics on Gitaly See merge request gitlab-org/gitlab-ce!15244
\| \| \| * \| \| \| \| \|	Add controller#action metrics on Gitaly	Zeger-Jan van de Weg	2017-11-28	1	-7/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	At this time we had good metrics on what number or requests each GRPC received, but were in the dark what controller#action combination was responsable. Or if Sidekiq was responsable. Now added are call counts per service and rpc matched with controller#action combinations.
\| \| * \| \| \| \| \| \|	Merge branch 'default-values-for-mr-states' into 'master'	Sean McGivern	2017-11-28	5	-3/+91
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix defaults for MR states and merge statuses Closes #40534 See merge request gitlab-org/gitlab-ce!15594
\| \| \| * \| \| \| \| \| \|	Fix defaults for MR states and merge statusesdefault-values-for-mr-states	Yorick Peterse	2017-11-24	5	-3/+91
\| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that merge_requests.state and merge_requests.merge_status both have a proper default value and NOT NULL constraint on database level. We also make sure to update any bogus rows first, without blowing up the database. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/40534
\| \| * \| \| \| \| \| \|	Merge branch 'hashed-storage-attachments-migration-path' into 'master'	Nick Thomas	2017-11-28	14	-150/+523
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hashed storage attachments migration path See merge request gitlab-org/gitlab-ce!15352
\| \| \| * \| \| \| \| \| \|	Changes to Attachments Migration for EE and Geo compatibility	Gabriel Mazetto	2017-11-28	3	-8/+22
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Backport EE changes to make test possible when prepending modules	Gabriel Mazetto	2017-11-24	3	-6/+18
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	fix exclusive lease specs fro hashed storage migration	Gabriel Mazetto	2017-11-23	2	-9/+15
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Changelog and Documentation for storage migration of project attachments	Gabriel Mazetto	2017-11-23	2	-13/+89
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Codestyle changes and Added Exclusive Lease to hashed storage migration	Gabriel Mazetto	2017-11-23	3	-15/+57
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	when rollingback repository migration, toggle readonly mode back	Gabriel Mazetto	2017-11-23	3	-6/+8
\| \| \| \| \| \| \| \| \| \|