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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove Coveralls and Semaphore badges. [ci skip]cleanup-readme	Connor Shea	2016-05-31	1	-2/+0
\|
*	Merge branch 'fix/migration-uri-issue' into 'master'	Robert Speicher	2016-05-27	2	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix import URL migration error Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17956 See merge request !4321
\| *	fix rescue block on migration	James Lopez	2016-05-27	2	-1/+2
\| \|
* \|	Merge branch 'bendyorke-comment-fix' into 'master'	Jacob Schatz	2016-05-27	2	-4/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update notes immediately after closing/reopening ## What does this MR do? Fixes MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4127 Thanks @bendyorke! ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? Constant conflicts in that MR ## What are the relevant issue numbers? ## Screenshots (if relevant) Fixes #15091 See merge request !4323
\| * \|	Update notes immediately after closing/reopening	Ben Yorke	2016-05-27	2	-4/+5
\| \|/
* \|	Merge branch 'calendar-activity-button-click' into 'master'	Jacob Schatz	2016-05-27	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Fixed issue with calendar activity button not sending request correctly When you click on a square it now sends the AJAX to the correct URL rather than the current URL. This was causing an issue where it would be loading the same page & inserting that into the DOM, rather than calendar activity events. See merge request !4322
\| *	Fixed issue with calendar activity button not sending request correctly	Phil Hughes	2016-05-27	1	-1/+1
\|/
*	Merge branch 'issuable-header-by-spacing' into 'master'	Jacob Schatz	2016-05-27	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with spacing in issuable header ## What does this MR do? Fixes an issue with spacing next to the word 'by' in the issuable header ## What are the relevant issue numbers? Closes #17864 ## Screenshots (if relevant) ![Screen_Shot_2016-05-27_at_11.53.37](/uploads/464c2149df304109726b7d7ab855ebe1/Screen_Shot_2016-05-27_at_11.53.37.png) See merge request !4314
\| *	Fixed issue with spacing in issuable headerissuable-header-by-spacing	Phil Hughes	2016-05-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	The Ruby was returning the HTML without a spacing next to the word 'by' Closes #17864
* \|	Merge branch 'workhorse-0.7.4' into 'master'	Yorick Peterse	2016-05-27	2	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhorse 0.7.4 See merge request !4317
\| * \|	Use gitlab-workhorse 0.7.4	Jacob Vosmaer	2016-05-27	2	-2/+2
\| \|/ \| \| \| \| \| \| \| \|	This enables https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4278 .
* \|	Merge branch 'queue-time-changelog' into 'master'	Yorick Peterse	2016-05-27	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Changelog entry for queue duration See merge request !4316
\| * \|	Changelog entry for queue duration	Jacob Vosmaer	2016-05-27	1	-0/+1
\| \|/
* \|	Merge branch 'fix-multiple-ci-status-poll' into 'master'	Jacob Schatz	2016-05-27	2	-2/+16
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed potential issue with 2 ci status polling events happening Possible cause for double notifications was if the request was slow & then you changed page whilst this request was happening it would finish on another page & then launch another interval - this stops that issue. Also passed in the CI status as an option value rather than waiting for the first ajax request to finish See merge request !3869
\| *	Fixed potential issue with 2 ci status polling events happeningfix-multiple-ci-status-poll	Phil Hughes	2016-05-26	2	-2/+16
\| \|
* \|	Merge branch 'fix-shortcuts-spec' into 'master'	Jacob Schatz	2016-05-27	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure project name is present on page ## What does this MR do? Fixes a failing spec See merge request !4307
\| * \|	Ensure project name is present on pagefix-shortcuts-spec	Alfredo Sumaran	2016-05-26	1	-2/+2
\| \| \|
* \| \|	Merge branch 'filter-by-any-user' into 'master'	Jacob Schatz	2016-05-26	4	-12/+46
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter issuables by any user ![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif) Closes #2836 See merge request !3820
\| * \| \|	Fixed user select failing tests on merge requestfilter-by-any-user	Phil Hughes	2016-05-26	1	-1/+1
\| \| \| \|
\| * \| \|	Filter issuables by any user	Phil Hughes	2016-05-26	4	-12/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2836
* \| \| \|	Merge branch 'rs-remove-pending-spec' into 'master'	Robert Speicher	2016-05-26	1	-5/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove boilerplate spec file for Ci::RunnerProject See merge request !4309
\| * \| \| \|	Remove boilerplate spec file for Ci::RunnerProject	Robert Speicher	2016-05-26	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'fix/gitlab-importer-issue' into 'master'	Robert Speicher	2016-05-26	2	-3/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitlab importer issue Fixed credentials not being called correctly - probably some bad refactoring or search & replace... Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565 See merge request !4301
\| * \| \| \| \|	added changelogfix/gitlab-importer-issue	James Lopez	2016-05-26	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	fix bad refactoring of import data credentials	James Lopez	2016-05-26	1	-3/+3
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'scroll-links-bug' into 'master'	Jacob Schatz	2016-05-26	1	-0/+21
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where fade div covers up controls button ## What does this MR do? Fixes bug where fade div covers up controls button ## Screenshots (if relevant) Before: <img src="/uploads/a6a883839255b8e10d872759a1aa54a0/Screen_Shot_2016-05-26_at_2.22.08_PM.png" width="300px"> After: <img src="/uploads/9ab53d9815470cf86f68f5a340ffc454/Screen_Shot_2016-05-26_at_2.22.42_PM.png" width="300px"> See merge request !4306
\| * \| \| \|	Fix bug where fade div covers up controls buttonscroll-links-bug	Annabel Dunstone	2016-05-26	1	-0/+21
\| \| \| \| \|
* \| \| \| \|	Merge branch 'remove-unnecessary-titles' into 'master'	Robert Speicher	2016-05-26	73	-78/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove header title from project pages With new navigation design it makes no sense to duplicate title in the header. See merge request !4304
\| * \| \| \|	Return header title for new project pageremove-unnecessary-titles	Dmitriy Zaporozhets	2016-05-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Remove header title from project pages	Dmitriy Zaporozhets	2016-05-26	73	-78/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With new navigation design it makes no sense to duplicate title in the header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'commit-header-buttons' into 'master'	Jacob Schatz	2016-05-26	4	-38/+63
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduced number of buttons in commit header ## What does this MR do? Reduces the buttons in the commit header. ## What are the relevant issue numbers? Closes #17576 ## Screenshots ![Screen_Shot_2016-05-26_at_11.22.24](/uploads/b0d8535bbc02ae367f193dd6633bd022/Screen_Shot_2016-05-26_at_11.22.24.png) See merge request !4302
\| * \| \| \| \|	Improved mobile stylingcommit-header-buttons	Phil Hughes	2016-05-26	2	-14/+37
\| \| \| \| \| \|
\| * \| \| \| \|	Reduced number of buttons in commit header	Phil Hughes	2016-05-26	4	-26/+28
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #17576
* \| \| \| \|	Merge branch 'move-project-dropdown-async' into 'master'	Jacob Schatz	2016-05-26	5	-9/+47
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Loads move issue dropdown async To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns. ![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif) Closes #16563 See merge request !4160
\| * \| \| \|	Updated Rubymove-project-dropdown-async	Phil Hughes	2016-05-25	1	-2/+5
\| \| \| \| \|
\| * \| \| \|	Correctly sends project ID	Phil Hughes	2016-05-20	3	-3/+3
\| \| \| \| \|
\| * \| \| \|	Fixed rubocop error	Phil Hughes	2016-05-16	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Updated tests	Phil Hughes	2016-05-16	1	-5/+10
\| \| \| \| \|
\| * \| \| \|	Loads move issue dropdown async	Phil Hughes	2016-05-16	4	-3/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #16563
* \| \| \| \|	Merge branch 'measure-proxy-timing' into 'master'	Yorick Peterse	2016-05-26	3	-0/+56
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Measure proxy flight time See merge request !4278
\| * \| \| \| \|	Rename metric to 'rails queue duration'	Jacob Vosmaer	2016-05-26	3	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Test ProxyFlightTime middleware	Jacob Vosmaer	2016-05-25	1	-0/+31
\| \| \| \| \| \|
\| * \| \| \| \|	Align class name with field name	Jacob Vosmaer	2016-05-25	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Send data to InfluxDB instead of stdout	Jacob Vosmaer	2016-05-25	1	-4/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Couple ProxyTiming to Metrics middleware	Jacob Vosmaer	2016-05-25	2	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Measure proxy timing: needs influxdb code	Jacob Vosmaer	2016-05-24	2	-0/+23
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'services-ui' into 'master'	Jacob Schatz	2016-05-26	2	-39/+45
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated services UI ![Screen_Shot_2016-05-17_at_10.38.10](/uploads/791ba27b3bbc18c9bde19ecf58ffea21/Screen_Shot_2016-05-17_at_10.38.10.png) See merge request !4177
\| * \| \| \| \|	Hide description on mobileservices-ui	Phil Hughes	2016-05-26	1	-25/+24
\| \| \| \| \| \|
\| * \| \| \| \|	Updated services UI	Phil Hughes	2016-05-17	2	-39/+46
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'remove-main-language' into 'master'	Josh Frye	2016-05-26	8	-83/+23
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove main_language and tests. Closes #14937 See merge request !4293