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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'	Dmitriy Zaporozhets	2018-09-20	2	-240/+275
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Split admin settings into multiple sub pages" Closes #44998 See merge request gitlab-org/gitlab-ce!21467
\| *	Groups test cases by context	Martin Wortschack	2018-09-18	1	-278/+266
\| \|
\| *	merge master and resolve conflicts	Martin Wortschack	2018-09-11	153	-1285/+3719
\| \|\
\| * \|	fix test for usage statistics	Martin Wortschack	2018-09-07	1	-0/+2
\| \| \|
\| * \|	merge master and resolve conflicts	Martin Wortschack	2018-09-06	121	-520/+5015
\| \|\ \
\| * \| \|	remove trailing whitespaces	Martin Wortschack	2018-09-05	1	-1/+1
\| \| \| \|
\| * \| \|	fix tests	Martin Wortschack	2018-09-05	1	-1/+1
\| \| \| \|
\| * \| \|	fix tests	Martin Wortschack	2018-09-05	1	-2/+47
\| \| \| \|
* \| \| \|	Merge branch 'mr-discussion-expanding-bug-fixes' into 'master'	Filipa Lacerda	2018-09-20	1	-0/+35
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed hidden truncated diff lines not showing when expanded See merge request gitlab-org/gitlab-ce!21801
\| * \| \| \|	Added test for adding `truncated_diff_lines` to discussion	Phil Hughes	2018-09-20	1	-0/+35
\| \| \| \| \|
* \| \| \| \|	Resolve "Link to file in Changes tab of MR no longer works for all files ↵	André Luís	2018-09-20	1	-17/+139
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	after incremental rendering improvement"
* \| \| \| \|	Merge branch 'sh-delete-tags-outside-transaction' into 'master'	Robert Speicher	2018-09-19	2	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete container repository tags outside of transaction Closes #51380 See merge request gitlab-org/gitlab-ce!21679
\| * \| \| \| \|	Move registry destroy out of project transaction	Stan Hu	2018-09-19	3	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Delete container repository tags outside of transaction	Stan Hu	2018-09-19	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When there are many tags in a container repository, deleting them can exceed the default 60 second idle-in-transaction timeout in Sidekiq. We now explicitly delete them in the DestroyService before destroying the model. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51380
* \| \| \| \| \|	Merge branch 'mr-legacy-diff-notes' into 'master'	Filipa Lacerda	2018-09-19	4	-11/+198
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-enable legacy diff notes on merge request diffs Closes #48873 See merge request gitlab-org/gitlab-ce!21652
\| * \| \| \| \| \|	Changed isDiscussionApplicableToLine to accept an object	Phil Hughes	2018-09-18	1	-14/+22
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added specs to isDiscussionApplicableToLine	Phil Hughes	2018-09-17	1	-10/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It now tests for the latest diff check
\| * \| \| \| \| \|	Updated LegacyDiffNote logic	Phil Hughes	2018-09-17	2	-4/+22
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Moved legacy diff note check into util method	Phil Hughes	2018-09-17	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Un-commented out expect checks in mutation spec
\| * \| \| \| \| \|	Fixed diff store actions spec	Phil Hughes	2018-09-17	3	-0/+139
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated diff mutations and utils spec to check for legacy notes
\| * \| \| \| \| \|	Re-enable legacy diff notes on merge request diffs	Phil Hughes	2018-09-17	1	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This re-enables legacy diff notes on the merge request diffs This feature was not workig correctly after the Vue refactor LegacyDiffNotes have no `position`, instead they only have a `line_code` As an extra, this also re-enables commenting on legacy diffs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48873
* \| \| \| \| \| \|	Fix grammar in runner-related specs, views and localisations.	Marcel Amirault	2018-09-19	2	-4/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Include post migrations when loading the schema	Yorick Peterse	2018-09-19	1	-0/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request gitlab-org/gitlab-ce!21689
\| * \| \| \| \| \| \|	Fix the schema load test	DJ Mountney	2018-09-12	1	-11/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And added changelog
\| * \| \| \| \| \| \|	Ensure the schema is loaded with post_migrations included	DJ Mountney	2018-09-11	1	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If doing a schema load, the post_migrations should also be marked as up, even if SKIP_POST_DEPLOYMENT_MIGRATIONS was set, otherwise future migration runs will be broken.
* \| \| \| \| \| \| \|	Use standalone diff stats RPC on every comparison view	Oswaldo Ferreira	2018-09-19	7	-0/+197
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'refactor-main-js' into 'master'	Phil Hughes	2018-09-19	4	-5/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor main.js content See merge request gitlab-org/gitlab-ce!19783
\| * \| \| \| \| \| \| \|	Move shortcuts classes into behaviors/shortcuts	Mike Greiling	2018-09-18	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move findAndFollowLink to lib/utils	Mike Greiling	2018-09-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move search autocomplete from dispatcher to main.js	Mike Greiling	2018-09-14	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'dz-combine-green-buttons' into 'master'	Filipa Lacerda	2018-09-19	7	-15/+15
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unite green buttons under one css class See merge request gitlab-org/gitlab-ce!21795
\| * \| \| \| \| \| \| \|	Unite green buttons under one css class	Dmitriy Zaporozhets	2018-09-19	7	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename btn-new, btn-create and btn-save to btn-success Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'mr-conflict-specs-enable' into 'master'	Tim Zallmann	2018-09-19	1	-14/+4
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-enables merge conflicts resolution spec See merge request gitlab-org/gitlab-ce!21654
\| * \| \| \| \| \| \| \|	Re-enables merge conflicts resolution spec	Phil Hughes	2018-09-11	1	-14/+4
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
* \| \| \| \| \| \| \|	Resolve "Enable Auto DevOps by default for self managed instances of GitLab"	Dylan Griffith	2018-09-18	7	-102/+137
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Improve cluster apps installation flow	Mike Greiling	2018-09-18	1	-1/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Improve TabHelper to clarify the use of Namespaces for the nav_link	Gabriel Mazetto	2018-09-18	2	-40/+99
\| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Don't use MilestoneFinder for group milestones	Douglas Barbosa Alexandre	2018-09-18	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This refactors the DashboardGroupMilestone model so that it no longer uses the MilestoneFinder, instead using methods defined on the Milestone model directly.
* \| \| \| \| \| \|	Merge branch '51564-fix-commit-email-usage' into 'master'	Douwe Maan	2018-09-18	5	-6/+69
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect the user commit email in more places Closes #51564 See merge request gitlab-org/gitlab-ce!21773
\| * \| \| \| \| \| \|	Guard against regressions in commit email specs	Nick Thomas	2018-09-18	4	-2/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use commit email for wiki actions	Nick Thomas	2018-09-17	1	-3/+23
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use the correct email address when committing via a file service	Nick Thomas	2018-09-17	4	-1/+38
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rs-have_link-arguments' into 'master'	Douwe Maan	2018-09-18	2	-5/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct usage of the have_link matcher See merge request gitlab-org/gitlab-ce!21755
\| * \| \| \| \| \| \| \|	Correct usage of the have_link matcher	Robert Speicher	2018-09-14	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The second option to this matcher should be an options hash; anything else is just ignored, which can lead to false positives in tests. We see one such false positive in the "Learn more" link test in `spec/features/projects/blobs/blob_show_spec.rb`.
* \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2018-09-18	2	-2/+38
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'45754-open-issues-from-archived-project-listed-in-group-issue-board' into 'master' Resolve "Open issues from archived project listed in group issue board" Closes #45754 See merge request gitlab-org/gitlab-ce!21721
\| * \| \| \| \| \| \| \| \|	Filter out archived projects from issue/mr count	Brett Walker	2018-09-17	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass the 'non_archived' flag to finder methods
\| * \| \| \| \| \| \| \| \|	Filter out archived issues from group issue board	Brett Walker	2018-09-14	1	-2/+10
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Expose runners status information in job api	Steve Azzopardi	2018-09-18	3	-1/+64
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-url-validator' into 'master'	Douglas Barbosa Alexandre	2018-09-17	1	-0/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow UrlValidator to work with attr_encrypted See merge request gitlab-org/gitlab-ce!21776
\| * \| \| \| \| \| \| \| \|	Allow UrlValidator to work with attr_encrypted	Nick Thomas	2018-09-17	1	-0/+15
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|