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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed testsdiscussion-notes	Phil Hughes	2016-04-14	2	-13/+13
\|
*	Dicussion action mobile fix	Phil Hughes	2016-04-14	1	-0/+11
\|
*	Discussion notes update	Phil Hughes	2016-04-14	7	-31/+25
\| \| \| \| \| \|	At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues Moved the dates to be in the header like other notes Fixed overlapping issue on mobile
*	Merge branch 'api-issue-update-and-note-create-backdating-14947' into 'master'	Rémy Coutable	2016-04-14	7	-7/+43
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	API issue update and note create back dating Closes #14947 See merge request !3551
\| *	Allow back dating notes on creation	Michael Greene	2016-04-13	4	-0/+20
\| \|
\| *	Allow back dating issues on update	Michael Greene	2016-04-13	4	-7/+23
\| \|
* \|	Merge branch 'issue_15222' into 'master'	Jacob Schatz	2016-04-13	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add test for search page Closes #15222 See merge request !3711
\| * \|	Add test to check if top right search form is not presentissue_15222	Alfredo Sumaran	2016-04-13	1	-0/+4
\|/ /
* \|	Merge branch 'redis_config_consistency' into 'master'	Valery Sizov	2016-04-13	3	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redis configuration consistency Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e See merge request !3697
\| * \|	Redis configuration consistencyredis_config_consistency	Valery Sizov	2016-04-13	3	-5/+5
\| \| \|
* \| \|	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 'update-influx-documentation' into 'master'	Achilleas Pipinellis	2016-04-13	1	-18/+30
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated InfluxDB/Grafana setup/import docs See https://gitlab.com/gitlab-org/grafana-dashboards/merge_requests/1 for some background info. cc @dblessing See merge request !3706
\| * \| \| \|	Updated InfluxDB/Grafana setup/import docs	Yorick Peterse	2016-04-13	1	-18/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The grafana-dashboards repository now contains _all_ GitLab.com dashboards and thus requires some extra continuous queries to be set up. The repository now also provided a way to automatically import/export dashboards. [ci skip]
* \| \| \| \|	Merge branch 'redis_improvements' into 'master'	Robert Speicher	2016-04-13	1	-5/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up ExclusiveLease See merge request !3695
\| * \| \| \| \|	clean up ExclusiveLeaseredis_improvements	Valery Sizov	2016-04-13	1	-5/+0
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master'	Robert Speicher	2016-04-13	3	-62/+221
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-62/+221
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-66/+219
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-58/+203
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Fix a bug with trailing slash in teamcity_url	Charles May	2016-04-12	2	-13/+21
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/3515
* \| \| \| \| \|	Merge branch 'async-related-mrs' into 'master'	Rémy Coutable	2016-04-13	6	-15/+66
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load related MRs/branches asynchronously cc @dzaporozhets See merge request !3678
\| * \| \| \| \| \|	Load related MRs/branches asynchronously	Yorick Peterse	2016-04-13	6	-15/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'api-subscribe-issue-mr' into 'master'	Rémy Coutable	2016-04-13	7	-0/+415
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Subscribe and unsubscribe from issues and merge requests * Closes #6024 This MR is based on !3611, which must be merged first. See merge request !3615
\| * \| \| \| \| \| \| \|	Ensure that issues and merge requests are found	Robert Schilling	2016-04-13	4	-7/+20
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make subscription API more RESTful	Robert Schilling	2016-04-13	7	-72/+68
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	API: Ability to subscribe and unsubscribe from a merge request	Robert Schilling	2016-04-13	5	-3/+216
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	API: Ability to subscribe and unsubscribe from an issue	Robert Schilling	2016-04-13	5	-0/+197
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'push-ref' into 'master'	Kamil Trzciński	2016-04-13	3	-5/+41
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	193	-839/+5058
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fix high CPU usage when PostReceive receives refs/merge-requests/<id>push-ref	Kamil Trzcinski	2016-04-11	3	-5/+41
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'api-star-project' into 'master'	Rémy Coutable	2016-04-13	6	-0/+214
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Star and unstar a project Add two new endpoints `POST /projects/:id/star` and `POST /projects/:id/unstar` to star and unstar a project. * Closes #12739 See merge request !3578
\| * \| \| \| \| \| \| \| \| \|	Styling changes to code and docs	Robert Schilling	2016-04-13	4	-9/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Make staring API more restful	Robert Schilling	2016-04-13	3	-16/+15
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	API: Star and unstar a project	Robert Schilling	2016-04-13	6	-0/+216
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'instrument-house-keeping' into 'master'	Rémy Coutable	2016-04-13	2	-4/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument the HousekeepingService class I'm starting with instrumenting this class as mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/15094#note_4796278. See merge request !3701
\| * \| \| \| \| \| \| \| \| \| \|	Instrument the HousekeepingService classinstrument-house-keeping	Yorick Peterse	2016-04-13	2	-4/+11
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'fix_grafana_docs' into 'master'	Achilleas Pipinellis	2016-04-13	4	-3/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Grafana docs and link from Influx page Fixing images and adding links to Influx docs, as suggested by @sytses See merge request !3702