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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Wait for ajax request to complete when testing milestont drang-n-drop feature	Dmitriy Zaporozhets	2016-12-29	1	-0/+6
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'gfm-new-line-fix' into 'master'	Fatih Acet	2016-12-28	1	-0/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix GFM dropdown not showing at beginning of new lines Closes #26145 See merge request !8338
\| *	Fix GFM dropdown not showing at beginning of new linesgfm-new-line-fix	Phil Hughes	2016-12-28	1	-0/+12
\| \| \| \| \| \| \| \|	Closes #26145
* \|	Merge branch 'fix-admin-group-page' into 'master'	Sean McGivern	2016-12-28	1	-0/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: Admin group show page does not work Closes #26147 See merge request !8339
\| * \|	Fix: Admin group show page does not workfix-admin-group-page	Valery Sizov	2016-12-28	1	-0/+10
\| \|/
* \|	Fix grammar error in text about mentioned issues	Grzegorz Bizon	2016-12-28	1	-2/+2
\|/
*	Merge branch '1659-long-tag-title' into 'master'	Annabel Dunstone Gray	2016-12-27	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Truncate the tag description and improve mobile layout for individual tag Closes #1659 See merge request !8220
\| *	Truncate tag description and fix mobile for inidividual tag1659-long-tag-title	Sam Rose	2016-12-27	1	-1/+1
\| \|
* \|	Merge branch 'auto-deploy-with-space' into 'master'	Sean McGivern	2016-12-27	1	-7/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename "autodeploy" to "auto deploy" Closes #25999 See merge request !8289
\| * \|	Rename "autodeploy" to "auto deploy"auto-deploy-with-space	Adam Niedzielski	2016-12-23	1	-7/+7
\| \| \|
* \| \|	Merge branch 'label-gfm-error-fix' into 'master'	Fatih Acet	2016-12-26	1	-1/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed error with GFM autocomplete when no data exists See merge request !8288
\| * \| \|	Fixed error with GFM autocomplete when no data existslabel-gfm-error-fix	Phil Hughes	2016-12-23	1	-1/+12
\| \|/ /
* \| \|	Replace wording for slash command confirmation message	victorwu	2016-12-26	2	-7/+7
\| \| \|
* \| \|	Improve spec for resetting incoming email token	Adam Niedzielski	2016-12-23	1	-6/+8
\|/ /
* \|	Merge branch 'markdown-input-symbol-regex' into 'master'	Jacob Schatz	2016-12-22	1	-0/+18
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Stops GFM special characters interfering with markdown tags See merge request !8265
\| * \|	Added tests for special charactersmarkdown-input-symbol-regex	Phil Hughes	2016-12-22	1	-0/+18
\| \| \|
* \| \|	Fix viewing "build failed" TODOs	Nick Thomas	2016-12-22	1	-0/+19
\|/ /
* \|	Merge branch '23638-remove-builds-tab' into 'master'	Kamil Trzciński	2016-12-21	2	-9/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove Builds tab from Merge Requests and Commits" Closes #23638 See merge request !7763
\| * \|	Changes after review	Filipa Lacerda	2016-12-21	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken test Remove spinach tests for the builds tab
\| * \|	Removes builds tab from merge request	Filipa Lacerda	2016-12-21	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Fix specs
* \| \|	Merge branch 'adam-auto-deploy' into 'master'	Kamil Trzciński	2016-12-21	1	-0/+64
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Auto deploy Closes #23580 See merge request !8135
\| * \|	Revert conflicting EE changes	Kamil Trzcinski	2016-12-21	3	-3/+11
\| \| \|
\| * \|	Added Autodeploy script for OpenShift	Kamil Trzcinski	2016-12-21	1	-2/+2
\| \| \|
\| * \|	Introduce "Set up autodeploy" button to help configure GitLab CI for deploymentadam-auto-deploy	Adam Niedzielski	2016-12-21	3	-2/+58
\| \|/ \| \| \| \| \| \| \| \| \| \|	The button allows to choose a ".gitlab-ci.yml" template that automatically sets up the deployment of an application. The currently supported template is Kubernetes template.
* \|	Merge branch '25879-emoji-autocomplete-starts-too-eagerly' into 'master'	Jacob Schatz	2016-12-21	1	-11/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix space issue and add test Closes #25879 See merge request !8217
\| * \|	Fix space issue and add test25879-emoji-autocomplete-starts-too-eagerly	Luke "Jared" Bennett	2016-12-21	1	-11/+16
\| \|/
* \|	Merge branch 'zj-mattermost-slash-config' into 'master'	Kamil Trzciński	2016-12-21	1	-15/+19
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Mattermost slash auto config Closes #24769 See merge request !8070
\| *	Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵	Kamil Trzcinski	2016-12-20	1	-9/+4
\| \|\ \| \| \| \| \| \| \| \| \|	into zj-mattermost-slash-config
\| \| *	Fix rspec tests due to different API	Z.J. van de Weg	2016-12-20	1	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| *	Fix rubocop errors [ci skip]	Z.J. van de Weg	2016-12-20	1	-1/+0
\| \| \|
\| * \|	Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config	Kamil Trzcinski	2016-12-20	4	-10/+153
\| \|\ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵	Kamil Trzcinski	2016-12-20	1	-35/+5
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	into zj-mattermost-slash-config
\| \| * \|	Fix tests	Luke "Jared" Bennett	2016-12-20	1	-35/+5
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config	Kamil Trzcinski	2016-12-20	6	-22/+285
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge branch 'master' into zj-mattermost-slash-config	Z.J. van de Weg	2016-12-19	3	-0/+95
\| \|\ \ \
\| * \| \| \|	Added integration tests	Luke "Jared" Bennett	2016-12-19	1	-14/+53
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix/25843' into 'master'	Sean McGivern	2016-12-20	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename SlackNotificationService back to SlackService ## What does this MR do? See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8191#note_20310845 ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25843 /cc @yorickpeterse @stanhu @smcgivern @felipe_artur @ayufan See merge request !8208
\| * \| \| \| \|	Rename SlackNotificationService back to SlackService	Douglas Barbosa Alexandre	2016-12-20	2	-2/+2
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch '19703-direct-link-pipelines' into 'master'	Grzegorz Bizon	2016-12-20	2	-9/+65
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Direct link from pipeline list to builds" ## What does this MR do? - Adds a dropdown with builds in the mini pipeline graph in the pipelines table - Unnest a lot of CSS related with pipelines in order to make it reusable ## Screenshots ![Screen_Shot_2016-12-15_at_14.45.41](/uploads/ca1c61842a422a34383e029d668034b7/Screen_Shot_2016-12-15_at_14.45.41.png) ![Screen_Shot_2016-12-15_at_14.45.49](/uploads/952e3277143639ce4ad111103034faeb/Screen_Shot_2016-12-15_at_14.45.49.png) ![Screen_Shot_2016-12-15_at_14.46.02](/uploads/f7369a124b1c3c0db4194de2cb637ef0/Screen_Shot_2016-12-15_at_14.46.02.png) ![graph_animation](/uploads/9bae036cb5acff499f992a4722943d72/graph_animation.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25071 Closes #19703 See merge request !8097
\| * \| \| \| \|	Fix stage and pipeline specs and rubocop offenses19703-direct-link-pipelines	Grzegorz Bizon	2016-12-20	1	-8/+17
\| \| \| \| \| \|
\| * \| \| \| \|	Move test for HTML stage endpoint to controller specs	Grzegorz Bizon	2016-12-20	2	-33/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix broken test	Filipa Lacerda	2016-12-20	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix broken test	Filipa Lacerda	2016-12-20	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes after review
\| * \| \| \| \|	Adds tests for the mini pipeline graph	Filipa Lacerda	2016-12-20	1	-3/+47
\| \| \| \| \| \|
\| * \| \| \| \|	Improve specs	Kamil Trzcinski	2016-12-20	1	-2/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Add tests for stage API endpoint	Kamil Trzcinski	2016-12-20	1	-0/+29
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'jej-fix-n+1-queries-milestones-show' into 'master'	Sean McGivern	2016-12-20	1	-0/+26
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix N+1 queries on milestone show pages Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25832 See merge request !8185
\| * \| \| \| \|	Added QueryRecorder to test N+1 fix on Milestone#showjej-fix-n+1-queries-milestones-show	James Edwards-Jones	2016-12-20	1	-0/+26
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix_team_member_expiration_date_spec' into 'master'	Grzegorz Bizon	2016-12-20	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix member with expiration date feature spec See merge request !8186
\| * \| \| \| \| \|	Fix member with expiration date feature specfix_team_member_expiration_date_spec	Felipe Artur	2016-12-19	1	-2/+2
\| \| \|/ / / / \| \|/\| \| \| \|