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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add optional argument to `spec:feature` task to split runs in halfrs-split-spec-feature	Robert Speicher	2016-05-26	2	-217/+237
\| \| \| \| \| \|	This is really naive and will just divide the file list in two. One half is likely to run much faster than the other, depending on which specs end up where.
*	Merge branch 'upgrade-state_machines-activerecord' into 'master'	Robert Speicher	2016-05-25	2	-6/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Update state_machines-activerecord from 0.3.0 to 0.4.0. Includes support for Rails 5, working towards #14286. See merge request !4295
\| *	Update state_machines-activerecord from 0.3.0 to 0.4.0.	Connor Shea	2016-05-25	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|	No changelog, see commits: https://github.com/state-machines/state_machines-activerecord/commits/master Includes Rails 5 support.
* \|	Merge branch 'add_ha_diagrams' into 'master'	Achilleas Pipinellis	2016-05-25	3	-0/+4
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Add new HA diagrams [ci skip] ## What does this MR do? Adds new HA diagrams created by @lukebabb (Thanks @lukebabb!) See merge request !4289
\| *	Add new HA diagrams [ci skip]	Drew Blessing	2016-05-25	3	-0/+4
\| \|
* \|	Merge branch 'rs-fix-rubocop' into 'master'	Robert Speicher	2016-05-25	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix RuboCop See merge request !4294
\| * \|	Fix RuboCop	Robert Speicher	2016-05-25	1	-1/+1
\|/ /
* \|	Merge branch 'rs-confirmation-mail' into 'master'	Robert Speicher	2016-05-25	13	-11/+210
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	New confirmation email See merge request !3354
\| * \|	Add CHANGELOG entry for redesigned confirmation emails	Robert Speicher	2016-05-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Don't remove IDs via premailer	Robert Speicher	2016-05-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This makes it easier to debug style rules.
\| * \|	New confirmation email :fire:	Robert Speicher	2016-05-25	8	-2/+188
\| \| \|
\| * \|	Make the standard Devise confirmation email our new plaintext version	Robert Speicher	2016-05-25	2	-9/+9
\| \| \|
\| * \|	Customize ActionMailer preview path	Robert Speicher	2016-05-25	2	-0/+12
\|/ /
* \|	Merge branch 'rs-remove-issue_to_atom' into 'master'	Douwe Maan	2016-05-25	5	-28/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `issue_to_atom` helper See merge request !4265
\| * \|	Remove `issue_to_atom` helperrs-remove-issue_to_atom	Robert Speicher	2016-05-23	5	-28/+17
\| \| \|
* \| \|	Merge branch 'improve-pipeline-design' into 'master'	Douwe Maan	2016-05-25	12	-56/+45
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve design of Pipeline view ## What does this MR do? Improves current design of Pipelines view when there is multiple stages. This makes the statuses clickable and makes the view more compact. ## Screenshots (if relevant) ![Screen_Shot_2016-05-21_at_01.20.40](/uploads/dd031b7af7005c7a61f3165fefa8b7c9/Screen_Shot_2016-05-21_at_01.20.40.png) cc @DouweM @markpundsack @rspeicher @marin See merge request !4230
\| * \| \|	Remove top block from builds pageimprove-pipeline-design	Annabel Dunstone	2016-05-24	3	-5/+0
\| \| \| \|
\| * \| \|	Remove icons from tables; remove timestamp from pipelines, remove info block ↵	Annabel Dunstone	2016-05-24	7	-32/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	at top of pipelines
\| * \| \|	Increase max-width of stage cells	Annabel Dunstone	2016-05-24	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into improve-pipeline-design	Kamil Trzcinski	2016-05-23	97	-546/+1502
\| \|\ \ \
\| * \| \| \|	Improve status rendering	Kamil Trzcinski	2016-05-21	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Improve design of Pipeline view	Kamil Trzcinski	2016-05-21	5	-21/+44
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-event-atom-partial' into 'master'	Douwe Maan	2016-05-25	8	-48/+39
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `event_to_atom` helper See merge request !4234
\| * \| \| \| \|	Render a collection for the Commits atom feedrs-event-atom-partial	Robert Speicher	2016-05-23	2	-14/+15
\| \| \| \| \| \|
\| * \| \| \| \|	Remove `event_to_atom` helper	Robert Speicher	2016-05-23	6	-34/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/import-url-uri-issue' into 'master'	Douwe Maan	2016-05-25	2	-1/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for import URL URI problem when URL contains a space Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17559 Prevents an already encoded URL to be encoded again - preventing %20 => %25%20 See merge request !4180
\| * \| \| \| \| \|	fix changelog and mergefix/import-url-uri-issue	James Lopez	2016-05-23	2	-2/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix merge conflicts	James Lopez	2016-05-23	458	-929/+8922
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	avoid encoding import url and delegate good format to user	James Lopez	2016-05-23	2	-17/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	added CHANGELOG	James Lopez	2016-05-17	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix for import URL URI problem when URL contains a space	James Lopez	2016-05-17	2	-5/+22
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'issue_10725' into 'master'	Douwe Maan	2016-05-25	4	-1/+48
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix forks creation when visibility level is restricted fixes #10725 See merge request !4283
\| * \| \| \| \| \| \| \|	Fix forks creation when visibility level is restrictedissue_10725	Felipe Artur	2016-05-25	4	-1/+48
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'zero-project-creation-error-message' into 'master'	Robert Speicher	2016-05-25	2	-2/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated error message when project limit is zero When the project limit is zero & the user tries to create a project, the error displayed is now 'Personal project creation is not allowed. Please contact your administrator with questions' Closes #17691 See merge request !4280
\| * \| \| \| \| \| \| \| \|	Fixed project model testszero-project-creation-error-message	Phil Hughes	2016-05-25	2	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Updated erorr message when project limit is zero	Phil Hughes	2016-05-24	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the project limit is zero & the user tries to create a project, the error displayed is now 'Personal project creation is not allowed. Please contact your administrator with questions' Closes #17691
* \| \| \| \| \| \| \| \| \|	Merge branch 'closed-by-alignment' into 'master'	Jacob Schatz	2016-05-25	2	-6/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related merge request text alignment Fixed the alignment of the text 'When this merge request is accepted...' on issues page ![Screen_Shot_2016-05-23_at_14.59.48](/uploads/5d2f4be94108364a9d004169a6825a9e/Screen_Shot_2016-05-23_at_14.59.48.png) See merge request !4251
\| * \| \| \| \| \| \| \| \| \|	Related merge request text alignmentclosed-by-alignment	Phil Hughes	2016-05-23	2	-6/+4
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'github/master' into 'master'	Robert Speicher	2016-05-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge pull request #10338 from donhui/patch-1	Robert Speicher	2016-05-25	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in HA documentation [ci skip]
\| \| * \| \| \| \| \| \| \| \| \|	typo fix: # Disable all components except Redis	donhui	2016-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	typo fix: # Disable all components except Redis
* \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG for 8.8.2	Robert Speicher	2016-05-25	1	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dz-improve-ui-guide' into 'master'	Jacob Schatz	2016-05-25	1	-0/+28
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Write some thoughts to the UI guide cc @skyruler See merge request !4290
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix the english.	Jacob Schatz	2016-05-25	1	-19/+14
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Write some thoughts to the UI guide	Dmitriy Zaporozhets	2016-05-25	1	-0/+33
\| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue-filter-name-options' into 'master'	Jacob Schatz	2016-05-25	11	-71/+203
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issuable filtering improvements This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests. Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both. Fixes #4252 Fixed issue with not being able to filter and sort issues without refreshing the page. Fixes #15269 See merge request !3699
\| * \| \| \| \| \| \| \| \| \| \| \|	Updated Ruby based on feedbackissue-filter-name-options	Phil Hughes	2016-05-24	3	-20/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fixed up JS comments	Phil Hughes	2016-05-20	2	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with not being able to search text & filter	Phil Hughes	2016-05-16	2	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fixed failing rubocop tests	Phil Hughes	2016-05-16	3	-41/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with issuable checkboxs not being init'd