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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make rubocop love me again zj-rspec-set	Zeger-Jan van de Weg	2017-04-26	1	-1/+1
\| \| \|	By adding a new line at the end of the file so this MR can move forward.
*	Merge branch 'master' into 'zj-rspec-set'	Rémy Coutable	2017-04-26	1016	-12494/+12007
\|\ \| \| \| \| \| \|	# Conflicts: # spec/requests/api/merge_requests_spec.rb
\| *	Merge branch '28202_decrease_abc_threshold_step1' into 'master'	Rémy Coutable	2017-04-26	3	-17/+24
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Decrease ABC threshold to 57.08 See merge request !10724
\| \| *	Decrease ABC threshold to 57.08	Maxim Rydkin	2017-04-26	3	-17/+24
\| \|/
\| *	Merge branch '31362_decrease_cyclomatic_complexity_threshold_step1' into ↵	Rémy Coutable	2017-04-26	3	-41/+35
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Decrease Cyclomatic Complexity threshold to 16 See merge request !10928
\| \| *	Decrease Cyclomatic Complexity threshold to 16	Maxim Rydkin	2017-04-26	3	-41/+35
\| \|/
\| *	Merge branch '31437-fix-transient-failure' into 'master'	Sean McGivern	2017-04-26	1	-2/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't expect underlying DB data to be updated in feature spec Closes #31437 See merge request !10934
\| \| *	Don't expect underlying DB data to be updated in feature spec	Rémy Coutable	2017-04-26	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only assert that the page shows something, this waits for requests to be completed. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Merge branch 'group-assignee-dropdown-send-group-id' into 'master'	Filipa Lacerda	2017-04-26	4	-1/+22
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Assignee filter on group issues/merge requests only loads group users Closes #29490 See merge request !10884
\| \| * \|	Assignee filter on group issues/merge requests only loads group usersgroup-assignee-dropdown-send-group-id	Phil Hughes	2017-04-24	4	-1/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #29490
\| * \| \|	Merge branch '20378-natural-sort-issue-numbers' into 'master'	Sean McGivern	2017-04-26	5	-9/+132
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change issues sentence to use natural sorting Closes #20378 See merge request !7110
\| \| * \| \|	Change issues sentence to use natural sorting	Jeff Stubler	2017-04-25	5	-9/+132
\| \| \| \| \|
\| * \| \| \|	Merge branch '31280-skip-issueables-without-project' into 'master'	Sean McGivern	2017-04-26	4	-26/+65
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip issuable without a project in IssuableExtractor#extract Closes #31280 See merge request !10906
\| \| * \| \| \|	issues_for_nodes => issuables_for_nodes31280-skip-issueables-without-project	Lin Jen-Shin	2017-04-26	1	-3/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Follow feedback on the review	Lin Jen-Shin	2017-04-26	2	-27/+51
\| \| \| \| \| \|
\| \| * \| \| \|	Skip issuable without a project in IssuableExtractor#extract	Lin Jen-Shin	2017-04-25	4	-56/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31280
\| * \| \| \| \|	Merge branch '31294-fix-oauth-users-do-not-need-to-be-confirmed-master' into ↵	Sean McGivern	2017-04-26	4	-9/+57
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Ensures that OAuth/LDAP/SAML users don't need to be confirmed Closes #31294 See merge request !10926
\| \| * \| \| \|	Fix logic in Users::CreateService broken by the fix for OAuth users	Rémy Coutable	2017-04-26	1	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Ensures that OAuth/LDAP/SAML users don't need to be confirmed	Rémy Coutable	2017-04-26	4	-4/+45
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Merge branch 'dz-bump-gitlab-shell' into 'master'	Douwe Maan	2017-04-25	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell version to 5.0.3 See merge request !10922
\| \| * \| \| \|	Bump gitlab-shell version to 5.0.3	Dmitriy Zaporozhets	2017-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Merge branch ↵	Robert Speicher	2017-04-25	4	-52/+13
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'30692-document-rspec-profile-and-mysql-branch-testing-and-remove-ci_setup-doc-page' into 'master' Remove outdated ci_setup.md doc page and document MySQL and RSpec profiling for specific branches Closes #30692 See merge request !10916
\| \| * \| \| \| \|	Remove outdated ci_setup.md doc page and document MySQL and RSpec profiling ↵30692-document-rspec-profile-and-mysql-branch-testing-and-remove-ci_setup-doc-page	Rémy Coutable	2017-04-25	4	-52/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for specific branches Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Merge branch 'update-mr-diff-blob-fork-suggestion-after-jquery-udpate' into ↵	Stan Hu	2017-04-25	1	-1/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update MR diff blob_fork_suggestion after jQuery update See merge request !10921
\| \| * \| \| \| \| \|	Update MR diff blob_fork_suggestion after jQuery updateupdate-mr-diff-blob-fork-suggestion-after-jquery-udpate	Eric Eastwood	2017-04-25	1	-1/+2
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`.init()` was added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10858 We need to add it the MR diff instance that was added in a separate MR and of course didn't add a conflict because it is a completely different piece
\| * \| \| \| \| \|	Merge branch 'metrics-graph-error-fix' into 'master'	Phil Hughes	2017-04-25	2	-29/+38
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Metrics graph error fix Closes #30840 See merge request !10839
\| \| * \| \| \| \| \|	Metrics graph error fix	Jose Ivan Vargas Lopez	2017-04-25	2	-29/+38
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'mr-diff-size-overflow' into 'master'	Douwe Maan	2017-04-25	6	-27/+52
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show correct size when MR diff overflows Closes #26560 See merge request !10827
\| \| * \| \| \| \|	Show correct size when MR diff overflows	Sean McGivern	2017-04-25	6	-27/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The problem is that we often go via a diff object constructed from the diffs stored in the DB. Those diffs, by definition, don't overflow, so we don't have access to the 'correct' `real_size` - that is stored on the MR diff object iself.
\| * \| \| \| \| \|	Merge branch '27827-cleanup-markdown' into 'master'	Phil Hughes	2017-04-25	12	-38/+48
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Clean up padding with Markdown headers" Closes #27827 See merge request !10350
\| \| * \| \| \| \| \|	Resolve "Clean up padding with Markdown headers"	Taurie Davis	2017-04-25	12	-38/+48
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'sh-bump-sidekiq-version' into 'master'	Robert Speicher	2017-04-25	2	-1/+5
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Sidekiq to 4.2.10 See merge request !10899
\| \| * \| \| \| \| \|	Upgrade Sidekiq to 4.2.10sh-bump-sidekiq-version	Stan Hu	2017-04-24	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://github.com/mperham/sidekiq/blob/master/Changes.md#4210
\| * \| \| \| \| \| \|	Merge branch '31174-project-integration-service-sub-nav' into 'master'	Alfredo Sumaran	2017-04-25	4	-2/+7
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sub-nav for Project Integration Services edit page Closes #31174 See merge request !10813
\| \| * \| \| \| \| \| \|	Add sub-nav for Project Integration Services edit page	Kushal Pandya	2017-04-25	4	-2/+7
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'dm-fix-oauth-user-creation' into 'master'	Robert Speicher	2017-04-25	7	-5/+47
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled Closes #31294 See merge request !10896
\| \| * \| \| \| \| \| \|	Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creation	Douwe Maan	2017-04-24	7	-5/+47
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch 'fix/web_hooks-index' into 'master'	Douwe Maan	2017-04-25	3	-1/+21
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index to webhooks type column Closes #31232 See merge request !10883
\| \| * \| \| \| \| \|	Add index to webhooks type column	James Lopez	2017-04-25	3	-1/+21
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'ignore-all-builds-dirs' into 'master'	Rémy Coutable	2017-04-25	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore all builds* directories from version control See merge request !10903
\| \| * \| \| \| \| \|	Ignore all builds* directories from version controlignore-all-builds-dirs	Achilleas Pipinellis	2017-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The restore process copies the old builds/ dir into builds.<epoch>/ which results in Git complaining about untracked files
\| * \| \| \| \| \| \|	Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master'	Douwe Maan	2017-04-25	6	-21/+64
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diffs with edit-forking needs Closes #31276 See merge request !10868
\| \| * \| \| \| \| \| \|	Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needs	Eric Eastwood	2017-04-24	6	-21/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276
\| * \| \| \| \| \| \| \|	Merge branch 'fix-usage-ping-doc-link' into 'master'	Rémy Coutable	2017-04-25	2	-1/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix usage ping docs link from empty cohorts page See merge request !10907
\| \| * \| \| \| \| \| \| \|	Fix usage ping docs link from empty cohorts pagefix-usage-ping-doc-link	Sean McGivern	2017-04-25	2	-1/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'patch-17' into 'master'	Rémy Coutable	2017-04-25	1	-8/+10
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update markdown.md See merge request !10776
\| \| * \| \| \| \| \| \| \| \|	Update markdown.md	Simon Hardt	2017-04-25	1	-8/+10
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch '21683-show-created-group-name-flash' into 'master'	Sean McGivern	2017-04-25	2	-1/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show group name on flash container when group is created from Admin area Closes #21683 See merge request !10905
\| \| * \| \| \| \| \| \| \|	Show group name on flash container when group is created from Admin area	Kushal Pandya	2017-04-25	2	-1/+5
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master'	Sean McGivern	2017-04-25	12	-23/+27
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't display the `is_admin?` flag for user API responses Closes #29903 See merge request !10846