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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix mysterious rubocop failuregitaly-0.45.1	Jacob Vosmaer	2017-10-10	1	-2/+2
\|
*	Run bundle	Jacob Vosmaer	2017-10-10	1	-2/+2
\|
*	Use gitaly-proto 0.41.0	Jacob Vosmaer	2017-10-10	1	-1/+1
\|
*	Use Gitaly 0.45.1	Jacob Vosmaer	2017-10-10	1	-1/+1
\|
*	Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into ↵	Robert Speicher	2017-10-10	3	-22/+92
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	'master' Migrate Workhorse Send{Diff,Patch} to Gitaly See merge request gitlab-org/gitlab-ce!14652
\| *	Migrate Workhorse Send{Diff,Patch} to Gitalyfeature/migrate-workhorse-send-git-diff-patch-to-gitaly	Ahmad Sherif	2017-10-09	3	-22/+92
\| \|
* \|	Merge branch 'ee-38771-ce-backport' into 'master'	Douwe Maan	2017-10-10	5	-2/+52
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Backports EE 38771 changes to CE. See merge request gitlab-org/gitlab-ce!14782
\| * \|	Backports EE 38771 changes to CE.	Tiago Botelho	2017-10-10	5	-2/+52
\| \| \|
* \| \|	Merge branch '38869-api' into 'master'	Phil Hughes	2017-10-10	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Api from main.js See merge request gitlab-org/gitlab-ce!14774
\| * \| \|	Remove Api from main.js38869-api	Filipa Lacerda	2017-10-09	1	-1/+0
\| \| \| \|
* \| \| \|	Merge branch 'winh-clarify-naming-imports-docs' into 'master'	Filipa Lacerda	2017-10-10	1	-4/+26
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make naming imports more clear Closes #38795 See merge request gitlab-org/gitlab-ce!14761
\| * \| \|	Make naming imports more clearwinh-clarify-naming-imports-docs winh-clarify-naming-imports	Winnie Hellmann	2017-10-09	1	-4/+26
\| \| \| \|
* \| \| \|	Merge branch ↵	Tim Zallmann	2017-10-10	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'38574-superfluous-export-in-advanced-settings-of-project-settings' into 'master' Resolve "Superfluous "Export" in "Advanced settings" of project settings" Closes #38574 See merge request gitlab-org/gitlab-ce!14773
\| * \| \| \|	fix incorrect description for advanced settings section of project settings38574-superfluous-export-in-advanced-settings-of-project-settings	Mike Greiling	2017-10-09	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch '34841-todos' into 'master'	Phil Hughes	2017-10-10	5	-52/+69
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bad type checking to prevent 0 count badge to be shown Closes #34841 See merge request gitlab-org/gitlab-ce!14767
\| * \| \|	Fix bad type checking to prevent 0 count badge to be shown	Filipa Lacerda	2017-10-10	5	-52/+69
\|/ / /
* \| \|	Merge branch 'wiki-empty-page-heading' into 'master'	Filipa Lacerda	2017-10-09	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wiki empty page translation namespace not being removed Closes #38920 See merge request gitlab-org/gitlab-ce!14759
\| * \| \|	Fix wiki empty page translation namespace not being removedwiki-empty-page-heading	Phil Hughes	2017-10-09	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Closes #38920
* \| \|	Merge branch 'rc/rename-codeclimate-to-codequality' into 'master'	Kamil Trzciński	2017-10-09	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename the `codeclimate` job to `codequality` See merge request gitlab-org/gitlab-ce!14766
\| * \| \|	Rename the `codeclimate` job to `codequality`rc/rename-codeclimate-to-codequality	Rémy Coutable	2017-10-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As per our documentation: https://docs.gitlab.com/ee/user/project/merge_requests/code_quality_diff.html#how-it-works Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master'	Douwe Maan	2017-10-09	22	-137/+659
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include the changes in issuable webhook payloads Closes #34284 See merge request gitlab-org/gitlab-ce!14308
\| * \| \| \|	Introduce new hook data builders for Issue and MergeRequest34284-add-changes-to-issuable-webhook-data	Rémy Coutable	2017-10-09	13	-224/+423
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Start adding Gitlab::HookData::IssuableBuilder	Rémy Coutable	2017-10-09	13	-150/+369
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Include the changes in issuable webhook payloads	Rémy Coutable	2017-10-09	14	-53/+157
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '38534-minigraph' into 'master'	Phil Hughes	2017-10-09	3	-4/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes mini graph in commit view Closes #38534 See merge request gitlab-org/gitlab-ce!14758
\| * \| \| \|	Fixes mini graph in commit view38534-minigraph	Filipa Lacerda	2017-10-09	3	-4/+14
\| \| \| \| \|
* \| \| \| \|	Merge branch 'jk-assignees-todos-fix' into 'master'	Sean McGivern	2017-10-09	3	-5/+30
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport of "Don't create todos for old issue assignees" See merge request gitlab-org/gitlab-ce!14765
\| * \| \| \| \|	Don't create todos for old issue assignees	Jarka Kadlecova	2017-10-09	3	-5/+30
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch '23888-fix-unsubscription-link-for-snippet-notification' into ↵	Sean McGivern	2017-10-09	4	-234/+390
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Don't show an "Unsubscribe" link in snippet comment notifications Closes #23888 See merge request gitlab-org/gitlab-ce!14764
\| * \| \| \| \|	Don't show an "Unsubscribe" link in snippet comment notifications	Rémy Coutable	2017-10-09	4	-234/+390
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'rs-qa-sandbox-group' into 'master'	Grzegorz Bizon	2017-10-09	8	-14/+138
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make use of a `gitlab-qa-sandbox` group if available See merge request gitlab-org/gitlab-ce!14682
\| * \| \| \| \|	Add QA::Scenario::Gitlab::Group::Create	Robert Speicher	2017-10-09	7	-59/+87
\| \| \| \| \| \|
\| * \| \| \| \|	Add QA::Page::Group::New to fill in the "Create group" formrs-qa-sandbox-group	Robert Speicher	2017-10-06	3	-13/+28
\| \| \| \| \| \|
\| * \| \| \| \|	Clean up QA::Page::Dashboard::Groups a bit	Robert Speicher	2017-10-06	1	-11/+16
\| \| \| \| \| \|
\| * \| \| \| \|	Use autoloading instead of an explicit require	Robert Speicher	2017-10-06	2	-1/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Implement Scenario::Gitlab::Sandbox::Prepare	Robert Speicher	2017-10-05	4	-34/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This better separates the concerns of preparing the sandbox namespace from creating a (sub)group.
\| * \| \| \| \|	Make use of a `gitlab-qa-sandbox` group if available	Robert Speicher	2017-10-04	3	-7/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will use a top-level group if it's available, or create one if it's not, then create our `qa_test_*` groups as subgroups of the sandbox group.
* \| \| \| \| \|	Merge branch 'group-sort-dropdown-blank' into 'master'	Robert Speicher	2017-10-09	3	-1/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed default group sort option Closes #38808 See merge request gitlab-org/gitlab-ce!14728
\| * \ \ \ \ \	Merge branch 'master' into 'group-sort-dropdown-blank'	Robert Speicher	2017-10-09	694	-3668/+15494
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/features/dashboard/group_spec.rb
\| * \| \| \| \| \|	Fixed default group sort optiongroup-sort-dropdown-blank	Phil Hughes	2017-10-06	3	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #38808
* \| \| \| \| \| \|	Merge branch '37483-activity-log-show-wrong-number-of-commits-per-push' into ↵	Rémy Coutable	2017-10-09	2	-2/+6
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix the number representing the amount of commits related to a push event Closes #37483 See merge request gitlab-org/gitlab-ce!14103
\| * \| \| \| \| \|	Fix the number representing the amount of commits related to a push event	Mark Fletcher	2017-10-06	2	-2/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bvl-fork-network-migrations' into 'master'	Yorick Peterse	2017-10-09	3	-0/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create fork networks for root projects that are deleted Closes #38905 See merge request gitlab-org/gitlab-ce!14752
\| * \| \| \| \| \| \|	Don't create fork networks for root projects that are deletedbvl-fork-network-migrations	Bob Van Landuyt	2017-10-09	3	-0/+18
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '37552-replace-js-true-with-js' into 'master'	Rémy Coutable	2017-10-09	182	-328/+461
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces `tag: true` into `:tag` in the specs Closes #37552 See merge request gitlab-org/gitlab-ce!14653
\| * \| \| \| \| \| \|	Replaces `tag: true` into `:tag` in the specs	Jacopo	2017-10-07	182	-328/+461
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces all the explicit include metadata syntax in the specs (tag: true) into the implicit one (:tag). Added a cop to prevent future errors and handle autocorrection.
* \| \| \| \| \| \| \|	Merge branch 'rc/do-not-retry-ee_compat_check' into 'master'	Sean McGivern	2017-10-09	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not retry jobs that are allowed to fail See merge request gitlab-org/gitlab-ce!14757
\| * \| \| \| \| \| \| \|	Do not retry jobs that are allowed to failrc/do-not-retry-ee_compat_check	Rémy Coutable	2017-10-04	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `ee_compat_check` job can take 10 minutes to run so it's a shame to retry it and loose 10 minutes if it fails for a good reason. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'icons-update-fix-regression-on-groups' into 'master'	Phil Hughes	2017-10-09	4	-5/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Icons + Fix for Collapsed Groups Angle See merge request gitlab-org/gitlab-ce!14754
\| * \| \| \| \| \| \| \| \|	Updated Icons + Fix for Collapsed Groups Angleicons-update-fix-regression-on-groups	Tim Zallmann	2017-10-09	4	-5/+5
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|