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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add vs heading in perforce docdocs/migrating-from-perforce	Achilleas Pipinellis	2017-08-30	1	-0/+2
\|
*	Add perforce migration doc	Achilleas Pipinellis	2017-08-29	2	-0/+49
\|
*	Merge branch '37102-fix-prometheus-graph-cursor-flag' into 'master'	Phil Hughes	2017-08-29	1	-8/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Ensure Prometheus graph overlay is in front of cursor flag Closes #37102 See merge request !13867
\| *	ensure graph overlay is in front of cursor flag37102-fix-prometheus-graph-cursor-flag	Mike Greiling	2017-08-28	1	-8/+8
\| \|
* \|	Merge branch '37104-fix-graph-date-format' into 'master'	Phil Hughes	2017-08-29	6	-15/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Monitoring graph date formatting is wrong" Closes #37104 See merge request !13865
\| * \|	Resolve "Monitoring graph date formatting is wrong"	Mike Greiling	2017-08-29	6	-15/+27
\|/ /
* \|	Merge branch '36114-stuck-mrs-job-follow-up' into 'master'	Sean McGivern	2017-08-29	10	-41/+75
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Present enqueued merge jobs as "Merging" as well (https://gitlab.com/gitlab-org/gitlab-ce/issues/31207 follow-up) Closes #36114 See merge request !13483
\| * \|	Cleans merge_jid when possible on MergeService36114-stuck-mrs-job-follow-up	Oswaldo Ferreira	2017-08-28	2	-8/+34
\| \| \|
\| * \|	Rename MergeRequest#async_merge to merge_async	Oswaldo Ferreira	2017-08-28	5	-7/+7
\| \| \|
\| * \|	Add changelog	Oswaldo Ferreira	2017-08-28	3	-12/+5
\| \| \|
\| * \|	Track enqueued and ongoing MRs	Oswaldo Ferreira	2017-08-28	8	-29/+44
\| \| \|
\| * \|	Remove locked? check when unlocking a merge request	Oswaldo Ferreira	2017-08-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Our state machine shall have enough knowledge to not allow states other than locked from transitioning to opened (e.g. MergeRequest#unlock_mr).
* \| \|	Merge branch 'short-code' into 'master'	Phil Hughes	2017-08-29	1	-0/+24
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add styles for shorter code See merge request !13612
\| * \| \|	Add styles for shorter code	Jacob Schatz	2017-08-29	1	-0/+24
\|/ / /
* \| \|	Merge branch '34413-move-convdev-index-location-to-after-cohorts' into 'master'	Phil Hughes	2017-08-29	4	-8/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move ConvDev Index location to after Cohorts Closes #34413 See merge request !13398
\| * \| \|	Move ConvDev index to Overview from Monitoring.34413-move-convdev-index-location-to-after-cohorts	Bryce Johnson	2017-08-18	4	-8/+12
\| \| \| \|
* \| \| \|	Merge branch 'rs-update-rubocop-gitlab-security' into 'master'	Douwe Maan	2017-08-29	4	-5/+9
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Update rubocop-gitlab-security to 0.1.0 See merge request !13879
\| * \| \|	Update rubocop-gitlab-security to 0.1.0rs-update-rubocop-gitlab-security	Robert Speicher	2017-08-28	4	-5/+9
\| \| \| \|
* \| \| \|	Merge branch '36582-fix-note-resolved-icon' into 'master'evn-fix-formatting-of-cla	Fatih Acet	2017-08-28	6	-6/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update and fix resolvable note icons for easier recognition Closes #36582 See merge request !13821
\| * \| \| \|	Update and fix resolvable note icons for easier recognition36582-fix-note-resolved-icon	Eric Eastwood	2017-08-25	6	-6/+25
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-update-templates-with-warning-header' into 'master'	Stan Hu	2017-08-28	3	-0/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update templates to include header in the README Closes #36904 See merge request !13785
\| * \| \| \| \|	Update templates to include header in the README	Zeger-Jan van de Weg	2017-08-23	3	-0/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Update CHANGELOG.md for 9.5.2	Jose Ivan Vargas	2017-08-28	7	-32/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'rs-transient-mini-pipeline-graph-failure' into 'master'	Douwe Maan	2017-08-28	1	-14/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a transient failure in mini_pipeline_graph_spec Closes #34323 See merge request !13844
\| * \| \| \| \| \|	Fix a transient failure in mini_pipeline_graph_specrs-transient-mini-pipeline-graph-failure	Robert Speicher	2017-08-28	1	-14/+4
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This spec failed reliably with a specific run order (see issue), the reasons for which are still unknown. This simplification resolves the failure. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34323
* \| \| \| \| \|	Merge branch 'group-mr-search-bar' into 'master'	Clement Ho	2017-08-28	4	-3/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add filtered search to group merge requests dashboard Closes #36703 See merge request !13688
\| * \| \| \| \| \|	Add changelog entry	Hiroyuki Sato	2017-08-28	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add a simple spec that checks filtered search works at group merge request page	Hiroyuki Sato	2017-08-27	1	-0/+15
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add filtered search to group merge requests dashboard	Hiroyuki Sato	2017-08-19	2	-3/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-add-spec-to-protected-tags-deletion' into 'master'	Robert Speicher	2017-08-28	1	-0/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec for deleting protected tags See merge request !13693
\| * \| \| \| \| \| \|	Add spec for deleting protected tagssh-add-spec-to-protected-tags-deletion	Stan Hu	2017-08-20	1	-0/+17
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fix/import-events' into 'master'	Sean McGivern	2017-08-28	4	-1/+15
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix events error importing GitLab projects Closes #36965 See merge request !13868
\| * \| \| \| \| \|	fix typo	James Lopez	2017-08-28	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix spec	James Lopez	2017-08-28	2	-1/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix events error importing GitLab projects	James Lopez	2017-08-28	2	-0/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-improve-flaky-ace-editor-spec' into 'master'	Robert Speicher	2017-08-28	1	-2/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve flaky ACE editor spec See merge request !13854
\| * \| \| \| \| \| \|	Improve flaky ACE editor specsh-improve-flaky-ace-editor-spec	Stan Hu	2017-08-26	1	-2/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The ACE editor JavaScript may not be loaded when the spec runs evaluateScript. Wait for the editor to load before attempting to run ACE-specific JavaScript.
* \| \| \| \| \| \|	Merge branch 'fix-flakes' into 'master'	Robert Speicher	2017-08-28	3	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix transient dropdown test failures Closes #37052 and #34436 See merge request !13862
\| * \| \| \| \| \| \|	fix transient test failures caused by wrong dropdown triggerfix-flakes	Simon Knox	2017-08-28	3	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '36061-mr-ref' into 'master'	Sean McGivern	2017-08-28	2	-0/+8
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument MergeRequest#ensure_ref_fetched See merge request !13876
\| * \| \| \| \| \| \|	Instrument MergeRequest#ensure_ref_fetched36061-mr-ref	Jarka Kadlecova	2017-08-28	2	-0/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'	Douwe Maan	2017-08-28	2	-19/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reenable MySQL tests on all CE and EE branches part 2 Closes #36384 See merge request !13840
\| * \| \| \| \| \| \| \|	Reenable MySQL tests on all branchesmk-reenable-mysql-tests-on-all-branches	Michael Kozono	2017-08-25	2	-19/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To protect master from surprise failures, as long as we continue to support MySQL.
* \| \| \| \| \| \| \| \|	Merge branch '36792-inline-user-refresh-when-creating-project' into 'master'	Douwe Maan	2017-08-28	8	-15/+107
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't wait for project authorization sidekiq jobs when creating projects Closes #36792 See merge request !13775
\| * \| \| \| \| \| \| \| \|	Don't treat gitlab project imports specially in Projects::CreateService	Nick Thomas	2017-08-25	1	-4/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Don't add admins as masters to projects created in another user's namespace	Nick Thomas	2017-08-25	2	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only admins have the ability to create a project in another user's personal namespace. Prior to this commit, we were explicitly adding them as masters to the project. However, admins already have access (by virture of being admins), so this is unnecessary.
\| * \| \| \| \| \| \| \| \|	Move sidekiq-based project authorization refresh out of Projects::CreateService	Nick Thomas	2017-08-25	7	-12/+107
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the project is in a group, the `group.refresh_members_authorized_projects` is made non-blocking, and we call `current_user.refresh_authorized_projects` directly. Projects in a personal namespace are more difficult. Rather than passing the `blocking:` parameter through the entire `add_master` chain, have the `AuthorizedProjectsWorker` automatically inline authorizations for three IDs or less. Since the maximum number of IDs in this path is 2, that has the same effect.
* \| \| \| \| \| \| \| \|	Merge branch 'rs-aggregate-system-note-specs' into 'master'	Douwe Maan	2017-08-28	1	-25/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Combine multiple expectations into one for shared system note example See merge request !13814
\| * \| \| \| \| \| \| \| \|	Combine multiple expectations into one for shared system note examplers-aggregate-system-note-specs	Robert Speicher	2017-08-24	1	-25/+4
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are all performing unique checks on the same object, so there's no benefit to isolating them.
* \| \| \| \| \| \| \| \|	Merge branch 'fix/gb/clear-schema-cache-after-running-migration-tests' into ↵	Sean McGivern	2017-08-28	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Clear schema cache after running tests for migrations Closes #37086 See merge request !13870