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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Wrap code in parallel viewparallel-diff	Annabel Dunstone	2016-04-14	1	-0/+5
\|
*	Merge branch 'start-with-iid-on-new-branch' into 'master'	Rémy Coutable	2016-04-14	3	-4/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Start with iid on branch creation After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name. See merge request !3708
\| *	Start with iid on branch creation	Zeger-Jan van de Weg	2016-04-14	3	-4/+4
\| \|
* \|	Fixed issue with other links being clicked in diffs	Phil Hughes	2016-04-14	1	-2/+2
\| \|
* \|	Correctly scrolls to the line when clicking	Phil Hughes	2016-04-14	1	-2/+10
\| \|
* \|	Diff viewer links to correct part of the file	Phil Hughes	2016-04-14	7	-8/+58
\| \| \| \| \| \| \| \| \| \| \| \|	Added highlight colours to diff rows Closes #13852
* \|	Merge branch 'simplify-gitlab-url_builder-15202' into 'master'	Rémy Coutable	2016-04-14	4	-9/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and expose only Gitlab::UrlBuilder.build(record) ``` $ git grep Gitlab::UrlBuilder app/models/commit.rb: url: Gitlab::UrlBuilder.build(self), app/services/issues/base_service.rb: issue_url = Gitlab::UrlBuilder.build(issue) app/services/merge_requests/base_service.rb: hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request) app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note) lib/gitlab/note_data_builder.rb: base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note) spec/lib/gitlab/note_data_builder_spec.rb: expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note)) spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do ``` Fixes #15202. See merge request !3696
\| * \|	Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202	Rémy Coutable	2016-04-13	4	-9/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Fixed scss syntax issue	Phil Hughes	2016-04-14	1	-1/+1
\| \| \|
* \| \|	Focus variable for dropzone	Phil Hughes	2016-04-14	2	-1/+2
\| \| \|
* \| \|	Added CHANGELOG item	Phil Hughes	2016-04-14	1	-2/+2
\| \| \|
* \| \|	Updated dropzone hover styling	Phil Hughes	2016-04-14	4	-22/+20
\| \| \|
* \| \|	Removed GL Actions class	Phil Hughes	2016-04-14	3	-57/+0
\| \| \|
* \| \|	Fixed group milestones placeholder bug	Phil Hughes	2016-04-14	1	-1/+1
\| \| \|
* \| \|	Placeholder on milestone form	Phil Hughes	2016-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Updated JS spec to include gl_form
* \| \|	Updated all GFM forms to use new GLForm class	Phil Hughes	2016-04-14	9	-37/+20
\| \| \|
* \| \|	Milestones use new GLForm class	Phil Hughes	2016-04-14	3	-6/+5
\| \| \|
* \| \|	merge request form uses new GLForm	Phil Hughes	2016-04-14	3	-3/+3
\| \| \|
* \| \|	Updated issue form to use new GLForm	Phil Hughes	2016-04-14	4	-6/+12
\| \| \|
* \| \|	Destroy discussion form	Phil Hughes	2016-04-14	2	-8/+22
\| \| \|
* \| \|	Notes form JS update	Phil Hughes	2016-04-14	5	-51/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated the JS to have a standard class with standard actions for each form Created ability to have toolbar buttons that insert different prefixes dependant upon the data-prefix attribute
* \| \|	Allow empty recipient list when pusher is added	Frank Groeneveld	2016-04-14	1	-3/+7
\| \|/ \|/\| \| \| \| \|	Closes #13574
* \|	Merge branch 'issue_14771' into 'master'	Jacob Schatz	2016-04-13	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide top search form on the search page Closes #14771 ![Screen_Shot_2016-04-11_at_6.04.19_PM](/uploads/44cf2110bad29c0df06d874740a3a61f/Screen_Shot_2016-04-11_at_6.04.19_PM.png) See merge request !3668
\| * \|	Hide top search form on the search pageissue_14771	Alfredo Sumaran	2016-04-11	1	-1/+1
\| \| \|
* \| \|	Merge branch 'issue_15093' into 'master'	Jacob Schatz	2016-04-13	1	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set tooltips for new added labels Fixes #15093 ![Screen_Shot_2016-04-11_at_5.50.21_PM](/uploads/52d06f6ccb3ca42e7ce75b94111514c2/Screen_Shot_2016-04-11_at_5.50.21_PM.png) See merge request !3667
\| * \| \|	Set tooltips for new added labelsissue_15093	Alfredo Sumaran	2016-04-11	1	-1/+3
\| \|/ /
* \| \|	Merge branch '14762-delete-button' into 'master'	Jacob Schatz	2016-04-13	1	-4/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update delete button Closes #14762 ![Screen_Shot_2016-04-11_at_5.21.32_PM](/uploads/fef09645eb70fc0fcaee359245664ddc/Screen_Shot_2016-04-11_at_5.21.32_PM.png) See merge request !3665
\| * \| \|	Update delete button14762-delete-button	Annabel Dunstone	2016-04-11	1	-4/+2
\| \|/ /
* \| \|	Merge branch 'issuable-form-alignment' into 'master'	Jacob Schatz	2016-04-13	2	-3/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed alignment on issuable new form Fixes #13802 ![Screen_Shot_2016-04-11_at_17.03.29](/uploads/d359580e693284d4b694d8158d4f736e/Screen_Shot_2016-04-11_at_17.03.29.png) See merge request !3661
\| * \| \|	Fixed alignment on issuable new formissuable-form-alignment	Phil Hughes	2016-04-11	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13802
* \| \| \|	Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master'	Robert Speicher	2016-04-13	1	-10/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a bug with trailing slash in bamboo_url Also, improve specs for BambooService Similar to !3679. See merge request !3680
\| * \| \| \|	Fix a bug with trailing slash in bamboo_url	Rémy Coutable	2016-04-13	1	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, improve specs for BambooService Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master'	Robert Speicher	2016-04-13	1	-14/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix trailing slash in teamcity_url Originally opened at !2309 by @ctmay4. As described in #3515, if you have trailing spaces in the the Teamcity server name, the service will not work properly. Switching from `URI.parse` to `URI.join` fixes it so that it works with or without a trailing slash. Fixes #3515. See merge request !3679
\| * \| \| \| \|	Improve TeamcityService and its specsfix-trailing-slash-in-teamcity_url-3515	Rémy Coutable	2016-04-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Fix a bug with trailing slash in teamcity_url	Charles May	2016-04-12	1	-13/+18
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/3515
* \| \| \| \|	Merge branch 'async-related-mrs' into 'master'	Rémy Coutable	2016-04-13	3	-13/+58
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load related MRs/branches asynchronously cc @dzaporozhets See merge request !3678
\| * \| \| \| \|	Load related MRs/branches asynchronously	Yorick Peterse	2016-04-13	3	-13/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently this works by loading the HAML partials via XHR. While this is not the nicest setup it _is_ the easiest setup using the tools we currently have. Loading this data asynchronously doesn't make loading the related MRs/branches itself faster, it merely ensures that loading the issue itself is not slowed down. Fixes gitlab-org/gitlab-ce#14949
* \| \| \| \| \|	Merge branch 'make_milestone_labels_tab_similar_to_labels_page' into 'master'	Jacob Schatz	2016-04-13	2	-13/+25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make milestone labels in labels tab similar to that of the labels page I realized that some of the changes for the labels page was not reflecting in the labels list in milestone page. ## Desktop ![Screen_Shot_2016-04-11_at_4.25.36_PM](/uploads/e21f3c5a9187fe32472e796171781b5d/Screen_Shot_2016-04-11_at_4.25.36_PM.png) ## Mobile ![Screen_Shot_2016-04-11_at_4.26.47_PM](/uploads/5c9f75ca0938fc30ab47c5520215f692/Screen_Shot_2016-04-11_at_4.26.47_PM.png) See merge request !3658
\| * \| \| \| \| \|	make milestone labels in labels tab similar to that of the labels pagemake_milestone_labels_tab_similar_to_labels_page	Arinde Eniola	2016-04-11	2	-13/+25
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'push-ref' into 'master'	Kamil Trzciński	2016-04-13	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix high CPU usage when PostReceive receives refs/merge-requests/<id> Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12661 See merge request !3651
\| * \ \ \ \ \ \	Merge branch 'master' into push-ref	Kamil Trzcinski	2016-04-13	108	-615/+875
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix high CPU usage when PostReceive receives refs/merge-requests/<id>push-ref	Kamil Trzcinski	2016-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-bug-causing-comment-to-submit-twice' into 'master'	Jacob Schatz	2016-04-13	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing comment form in issue to submit twice when CTRL+Enter is pressed twice See merge request !3655
\| * \| \| \| \| \| \| \| \|	fix bug causing comment form in issue to submit twice when CTRL+Enter is ↵fix-bug-causing-comment-to-submit-twice	Arinde Eniola	2016-04-11	1	-1/+5
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pressed twice
* \| \| \| \| \| \| \| \|	Merge branch 'carousel-remove' into 'master'	Robert Speicher	2016-04-13	2	-2/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Bootstrap Carousel The Bootstrap carousel module is used for image carousels, and we don't use it anywhere on the site. Fixes #14670. See merge request !3624
\| * \| \| \| \| \| \| \| \|	Remove Bootstrap Carousel	connorshea	2016-04-12	2	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Bootstrap carousel module is used for image carousels, and we don't use it anywhere on the site. Also separated the Bootstrap JavaScript into separate components and removed the carousel component. Fixes #14670.
* \| \| \| \| \| \| \| \| \|	Instrument the HousekeepingService classinstrument-house-keeping	Yorick Peterse	2016-04-13	1	-4/+10
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to track how much time is spent in updating the "pushes_since_gc" column as well as the time needed to obtain the lease.
* \| \| \| \| \| \| \| \|	Merge branch 'label-filter' into 'master'	Jacob Schatz	2016-04-13	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed not being able to filter by any or no labels Brings back the options to filter by any or no label Closes #15008 ![Screen_Shot_2016-04-07_at_11.26.41](/uploads/20d949b19f537d830118532e1d44feb7/Screen_Shot_2016-04-07_at_11.26.41.png) See merge request !3589
\| * \| \| \| \| \| \| \|	Filtering by any label keeps the text on the toggle buttonlabel-filter	Phil Hughes	2016-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed issue with any label & no label filters missing	Phil Hughes	2016-04-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15008