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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use a slightly cleaner approach to stub ENVrc/a-better-stub-env	Rémy Coutable	2017-06-28	1	-9/+27
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'issue-form-multiple-line-markdown' into 'master'	Filipa Lacerda	2017-06-27	3	-38/+75
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed multi-line markdown in issue edit form Closes #34318 See merge request !12458
\| *	Fixed multi-line markdown in issue edit formissue-form-multiple-line-markdown	Phil Hughes	2017-06-26	3	-38/+75
\| \| \| \| \| \| \| \|	Closes #34318
* \|	Merge branch 'zj-review-apps-usage-data' into 'master'	Grzegorz Bizon	2017-06-27	4	-0/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add review apps to usage ping Closes #33171 See merge request !12185
\| * \|	Add in_review_folder to usage pingzj-review-apps-usage-data	Z.J. van de Weg	2017-06-27	4	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As its hard to reliably check how many review apps there are on the clients machine, we start by checking where the type is `review`. This means the folder is called that way. This will lead to a seq scan on the table. However, this is done once a week, so the benefit of adding an index seems not to apply here.
* \| \|	Merge branch '34168-cannot-edit-prioritized-labels-issues-with-firefox' into ↵	Phil Hughes	2017-06-27	4	-3/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Action Buttons on Prio Labels working again by setting pointer events to none on… Closes #34168 See merge request !12473
\| * \| \|	Action Buttons on Prio Labels working again by setting pointer events to ↵	Tim Zallmann	2017-06-27	4	-3/+10
\|/ / / \| \| \| \| \| \| \| \| \|	none on…
* \| \|	Merge branch '34324-gitlab-db-seed-is-broken' into 'master'	Rémy Coutable	2017-06-27	2	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "GitLab DB seed is broken" Closes #34324 See merge request !12464
\| * \| \|	Fix Gitlab::Database.bulk_insert for non-UTF-8 data34324-gitlab-db-seed-is-broken	Sean McGivern	2017-06-26	2	-1/+5
\| \| \| \|
* \| \| \|	Merge branch 'pat-alert-when-signin-disabled' into 'master'	Rémy Coutable	2017-06-27	11	-31/+274
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide hint to create a personal access token for Git over HTTP See merge request !12105
\| * \| \| \|	Provide hint to create a personal access token for Git over HTTP	Robin Bobbitt	2017-06-26	11	-31/+274
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If internal auth is disabled and user is not an LDAP user, present the user with an alert to create a personal access token if he does not have one already.
* \| \| \| \|	Merge branch 'sh-unset-stubenv' into 'master'	Rémy Coutable	2017-06-27	1	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset the state of StubENV's @env_already_stubbed after each spec run See merge request !12438
\| * \| \| \| \|	Reset the state of StubENV's @env_already_stubbed after each spec runsh-unset-stubenv	Stan Hu	2017-06-26	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In certain combination of tests, @env_already_stubbed could be set to `true` even though it never ran for that specific test.
* \| \| \| \| \|	Merge branch 'fix-33991' into 'master'	Sean McGivern	2017-06-27	4	-23/+86
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow users to subscribe to group labels on the group labels page Closes #33991 See merge request !12402
\| * \| \| \| \| \|	Fix missing hidden class when subscribed to a group labelfix-33991	Douglas Barbosa Alexandre	2017-06-26	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix LabelsHelper#toggle_subscription_label_path	Douglas Barbosa Alexandre	2017-06-26	1	-4/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix LabelsHelper#can_subscribe_to_label_in_different_levels	Douglas Barbosa Alexandre	2017-06-26	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve scenario description for the group labels subscription spec	Douglas Barbosa Alexandre	2017-06-26	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add can_subscribe_to_label_in_different_levels helper method	Douglas Barbosa Alexandre	2017-06-26	2	-12/+16
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Extract common paths to a variable	Douglas Barbosa Alexandre	2017-06-26	1	-4/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add CHANGELOG	Douglas Barbosa Alexandre	2017-06-26	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Allow users to subscribe to group labels on group labels page	Douglas Barbosa Alexandre	2017-06-26	3	-16/+68
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '23036-replace-dashboard-todo-spinach' into 'master'	Rémy Coutable	2017-06-27	9	-618/+399
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces 'dashboard/todos' spinach with rspec See merge request !12453
\| * \| \| \| \| \| \|	Replaces 'dashboard/todos' spinach with rspec	Alexander Randa	2017-06-26	9	-618/+399
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '34052-store-mr-ref-fetched-in-database' into 'master'	Sean McGivern	2017-06-27	7	-3/+63
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store merge request ref_fetched status in the database Closes #34052 See merge request !12424
\| * \| \| \| \| \| \| \|	Store merge request ref_fetched status in the database34052-store-mr-ref-fetched-in-database	Adam Niedzielski	2017-06-26	7	-3/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #34052
* \| \| \| \| \| \| \| \|	Merge branch '34282-fix-api-using-include_missing-false' into 'master'	Grzegorz Bizon	2017-06-27	3	-1/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix optional arugments for POST :id/variables Closes #34282 See merge request !12474
\| * \| \| \| \| \| \| \| \|	Add changelog entry	Lin Jen-Shin	2017-06-27	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix optional args for POST :id/variables	Lin Jen-Shin	2017-06-27	2	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always use declared_params(include_missing: false) so that we don't give nils for optional arguments
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-mr-widget-no-pipeline' into 'master'	Phil Hughes	2017-06-27	2	-19/+56
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle missing pipeline in merge request widget Closes #32987 See merge request !12127
\| * \| \| \| \| \| \| \| \| \|	Handle Promise rejections in mr_widget_pipeline_spec.js	winh	2017-06-26	1	-24/+35
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Handle missing pipeline in merge request widget	winh	2017-06-26	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add failing test for #32987	winh	2017-06-22	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'polish-sidebar-toggle' into 'master'	Phil Hughes	2017-06-27	7	-3/+65
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Polish sidebar toggle Closes #28046 See merge request !12242
\| * \| \| \| \| \| \| \| \| \|	Polish sidebar toggle	Clement Ho	2017-06-27	7	-3/+65
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '34309-drop-gfm-mr-ms' into 'master'	Sean McGivern	2017-06-27	3	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Drop GFM support for the title of Milestone/MergeReuqest in template Closes #34309 See merge request !12451
\| * \| \| \| \| \| \| \| \| \|	Drop GFM support for the title of Milestone/MergeRequest in template	Takuya Noguchi	2017-06-27	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'update_bootsnap_1.1.1' into 'master'	Robert Speicher	2017-06-27	4	-0/+15
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump bootsnap to 1.1.1 Closes #34084 See merge request !12425
\| * \| \| \| \| \| \| \| \| \| \|	Bump bootsnap to 1.1.1	blackst0ne	2017-06-27	4	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.3.1	Clement Ho	2017-06-26	7	-25/+9
\| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \|	Merge branch '33600-fix-uncaught-throw-in-ee_compat_check' into 'master'	Robert Speicher	2017-06-26	1	-4/+17
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an uncaught throw in the ee_compat_check job Closes #33600 See merge request !12123
\| * \| \| \| \| \| \| \| \| \| \|	Fix an uncaught throw in the ee_compat_check job	Rémy Coutable	2017-06-21	1	-4/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-unused-argument' into 'master'	Sean McGivern	2017-06-26	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused Gitlab::Git::Commit#to_diff argument See merge request !12466
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove unused Gitlab::Git::Commit#to_diff argument	Jacob Vosmaer	2017-06-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-nested-group-spec-on-mysql' into 'master'	Robert Speicher	2017-06-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tag a spec as :nested_groups since it fails on MySQL See merge request !12459
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Tag a spec as :nested_groups since it fails on MySQLfix-nested-group-spec-on-mysql	Rémy Coutable	2017-06-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was broken by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12322. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'accepting-mrs-more-prominent' into 'master'	Sid Sijbrandij	2017-06-26	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make accepting mrs more prominent See merge request !12446
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	make accepting mrs more prominentaccepting-mrs-more-prominent	Job van der Voort	2017-06-26	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-06-26	5	-1/+1150
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34286_add_esperanto_translations_for_cycle_analytics_and_project_and_repository_pages' into 'master' Add Esperanto translations for Cycle Analytics, Project, and Repository pages Closes #34286 See merge request !12442
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Esperanto translations for Cycle Analytics, Project, and Repository pages	黄涛	2017-06-26	5	-1/+1150
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #34286