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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Attempted improvement to stop boards spec failingboards-spec-improvements	Phil Hughes	2016-08-18	2	-4/+30
\|
*	Merge branch 'fix/update-gitlab-git' into 'master'	Yorick Peterse	2016-08-18	3	-3/+4
\|\ \| \| \| \| \| \| \| \|	Update gitlab_git gem to 10.4.7 See merge request !5851
\| *	Update gitlab_git gem to 10.4.7	Ahmad Sherif	2016-08-18	3	-3/+4
\| \|
* \|	Merge branch 'patch-3' into 'master'	Drew Blessing	2016-08-18	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix documentation of gitlab-ci's `when` keyword. ## What does this MR do? Fixes description of the `when` keyword in the Jobs keywords description table. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5868
\| *	The keyword `when` can also take `manual` as a value.	Maxime Buquet	2016-08-18	1	-1/+1
\|/
*	Merge branch 'tab-persistance' into 'master'	Rubén Dávila Santos	2016-08-18	5	-15/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make new tabs persistent when changing view. ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc @stanhu @DouweM @rdavila See merge request !5859
\| *	Refactor to mark Changes tab as active on new MR page.	Ruben Davila	2016-08-18	4	-14/+5
\| \|
\| *	Fix failing testtab-persistance	Alfredo Sumaran	2016-08-17	1	-4/+7
\| \| \| \| \| \| \| \|	Test was not waiting for the page to be fully loaded
\| *	Fix tabs navigation and do not update URL via pushstate	Alfredo Sumaran	2016-08-17	3	-9/+15
\| \|
* \|	Merge branch 'doc-refactor-description-templates' into 'master'	Achilleas Pipinellis	2016-08-18	6	-14/+44
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor description templates documentation ## What are the relevant issue numbers? Refactors docs introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4981 See merge request !5839
\| *	Add new image to show the 'Reset template' button	Achilleas Pipinellis	2016-08-18	2	-5/+6
\| \|
\| *	Refactor description templates documentation	Achilleas Pipinellis	2016-08-18	5	-14/+43
\|/
*	Merge branch '18141-pipeline-graph' into 'master'	Jacob Schatz	2016-08-17	11	-17/+272
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pipeline graph ## What does this MR do? Adds pipeline visualization ## What are the relevant issue numbers? Closes #18141 Part of #19982 ## Screenshots (if relevant) ![Screen_Shot_2016-08-16_at_7.59.52_PM](/uploads/c9dd695d2ddbd2a85e98a5b4e500d52c/Screen_Shot_2016-08-16_at_7.59.52_PM.png) ![Screen_Shot_2016-08-16_at_7.55.49_PM](/uploads/5ab548cc5fc8a42371d3b54108798c02/Screen_Shot_2016-08-16_at_7.55.49_PM.png) See merge request !5742
\| *	Remove index from pipeline toggles18141-pipeline-graph	Annabel Dunstone	2016-08-17	2	-10/+12
\| \|
\| *	Merge master into branch	Annabel Dunstone	2016-08-17	60	-89/+13748
\| \|\
\| * \|	Move deployable conditional to variable; fix pipelines_spec	Annabel Dunstone	2016-08-17	2	-3/+8
\| \| \|
\| * \|	Update CSS selector and play icon	Annabel Dunstone	2016-08-17	3	-4/+4
\| \| \|
\| * \|	Add deploy btn in graph; fix JS to toggle one graph at a time if multiple ↵	Annabel Dunstone	2016-08-17	4	-7/+17
\| \| \| \| \| \| \| \| \| \| \| \|	pipelines
\| * \|	Add support for Play and Created jobs	Kamil Trzcinski	2016-08-17	4	-35/+41
\| \| \|
\| * \|	Merge branch '18141-pipeline-graph' of gitlab.com:gitlab-org/gitlab-ce into ↵	Kamil Trzcinski	2016-08-17	3	-23/+75
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	18141-pipeline-graph # Conflicts: # app/assets/stylesheets/pages/pipelines.scss # app/views/projects/commit/_pipeline.html.haml
\| \| * \|	Add links to pipeline graph	Annabel Dunstone	2016-08-16	2	-1/+5
\| \| \| \|
\| \| * \|	Add toggle button to hide graph; set max-height	Annabel Dunstone	2016-08-16	3	-28/+71
\| \| \| \|
\| \| * \|	Fix scss lint error	Annabel Dunstone	2016-08-16	1	-2/+2
\| \| \| \|
\| \| * \|	Fix graph scrolling bug	Annabel Dunstone	2016-08-16	2	-9/+9
\| \| \| \|
\| \| * \|	Truncate build and stage names	Annabel Dunstone	2016-08-16	3	-18/+29
\| \| \| \|
\| \| * \|	Add min width and horizontally scroll pipeline graph when overflow	Annabel Dunstone	2016-08-16	1	-6/+17
\| \| \| \|
\| \| * \|	Connect all builds in visual pipeline	Annabel Dunstone	2016-08-16	1	-8/+73
\| \| \| \|
\| \| * \|	Connect top level tests to each other	Annabel Dunstone	2016-08-16	2	-5/+61
\| \| \| \|
\| \| * \|	Add build data to top of pipeline page	Annabel Dunstone	2016-08-16	2	-0/+18
\| \| \| \|
\| * \| \|	Split pipeline status item for Commit Status and Build	Kamil Trzcinski	2016-08-17	4	-15/+27
\| \| \| \|
\| * \| \|	Update fixtures to add a created status to pipeline	Kamil Trzcinski	2016-08-17	1	-5/+4
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into 18141-pipeline-graph	Kamil Trzcinski	2016-08-17	479	-5035/+10514
\| \|\ \ \
\| * \| \| \|	Update fixtures to make development testing easier	Kamil Trzcinski	2016-08-17	1	-6/+26
\| \| \| \| \|
\| * \| \| \|	Fix pipelines visualisation rendering	Kamil Trzcinski	2016-08-17	3	-7/+15
\| \| \| \| \|
\| * \| \| \|	Fix scss lint error	Annabel Dunstone	2016-08-09	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Fix graph scrolling bug	Annabel Dunstone	2016-08-09	2	-9/+9
\| \| \| \| \|
\| * \| \| \|	Truncate build and stage names	Annabel Dunstone	2016-08-09	3	-20/+29
\| \| \| \| \|
\| * \| \| \|	Add min width and horizontally scroll pipeline graph when overflow	Annabel Dunstone	2016-08-09	1	-6/+17
\| \| \| \| \|
\| * \| \| \|	Connect all builds in visual pipeline	Annabel Dunstone	2016-08-09	2	-23/+90
\| \| \| \| \|
\| * \| \| \|	Connect top level tests to each other	Annabel Dunstone	2016-08-09	2	-19/+75
\| \| \| \| \|
\| * \| \| \|	Add build data to top of pipeline page	Annabel Dunstone	2016-08-09	2	-0/+18
\| \| \| \| \|
* \| \| \| \|	Merge branch '18516-collapse-build-tabs' into 'master'	Jacob Schatz	2016-08-17	6	-119/+234
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Collapse build tabs that don't fit ## What does this MR do? * Orders tests from `failed` > `pending` > `running` > `canceled` > `skipped` > `success` * Put stages in one dropdown * Once stage is selected, second dropdown shows all builds/jobs for that stage ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? So many tests! <img src="/uploads/d581b2670588121c6d64823f61906a1a/Screen_Shot_2016-08-01_at_9.52.50_AM.png" width="600px"> ## What are the relevant issue numbers? Closes #18516 Part of #19982 ## Screenshots (if relevant) ![Screen_Shot_2016-08-17_at_1.14.20_PM](/uploads/fa183361ed13137257caf20a6afc4ef1/Screen_Shot_2016-08-17_at_1.14.20_PM.png) ![Screen_Shot_2016-08-17_at_1.14.39_PM](/uploads/f568cac463abf5c625cf31912ddbd00a/Screen_Shot_2016-08-17_at_1.14.39_PM.png) See merge request !5595
\| * \| \| \| \|	Remove params from build; general refactor	Annabel Dunstone	2016-08-17	3	-10/+23
\| \| \| \| \| \|
\| * \| \| \| \|	Style build container box; add check mark to active build18516-collapse-build-tabs	Annabel Dunstone	2016-08-17	3	-3/+31
\| \| \| \| \| \|
\| * \| \| \| \|	Display jobs as scrolling list in sidebar	Annabel Dunstone	2016-08-17	3	-128/+149
\| \| \| \| \| \|
\| * \| \| \| \|	Move stages and jobs to build sidebar	Annabel Dunstone	2016-08-17	3	-38/+39
\| \| \| \| \| \|
\| * \| \| \| \|	Move skipped tests to end of array	Annabel Dunstone	2016-08-17	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unused data attributes	Annabel Dunstone	2016-08-17	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Update changelog	Annabel Dunstone	2016-08-17	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Style build dropdowns	Annabel Dunstone	2016-08-17	2	-24/+11
\| \| \| \| \| \|