summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'fix-issue-filter-spec' into 'master' Rubén Dávila Santos2016-08-181-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken feature spec. This older spec was failing: features/project/issues/issues.feature Looks like before we were doing an exact match for queries, that's why it was passing with this existing issue: https://gitlab.com/gitlab-org/gitlab-ce/blob/59fa031e6f7d5a1b658c370f581c4caaf4493150/features/project/issues/issues.feature#L128 Failed build: https://gitlab.com/gitlab-org/gitlab-ce/builds/3178231 See merge request !5857
| | * | | | | | | Fix broken feature spec.fix-issue-filter-specRuben Davila2016-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This older spec was failing: features/project/issues/issues.feature Looks like before we were doing an exact match for queries, that's why it was passing with this existing issue: https://gitlab.com/gitlab-org/gitlab-ce/blob/59fa031e6f7d5a1b658c370f581c4caaf4493150/features/project/issues/issues.feature#L128 Failed build: https://gitlab.com/gitlab-org/gitlab-ce/builds/3178231
| * | | | | | | | Merge branch 'evn-reword-cla' into 'master' Sid Sijbrandij2016-08-181-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove undefined word Corporation from CCLA ## What does this MR do? Removes the (undefined) word "Corporation" from the CCLA, per advice from legal counsel. ## Why was this MR needed? The word Corporation was undefined, while the word "You" already included "legal entities". ## What are the relevant issue numbers? - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3685 - https://gitlab.com/gitlab-org/gitlab-ce/issues/15156 \cc @pmachle See merge request !5835
| | * | | | | | | | remove undefined word Corporation from CCLAevn-reword-claernstvn2016-08-161-2/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'fix/simplify-todo-destroy-queries' into 'master' Yorick Peterse2016-08-184-16/+27
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify SQL queries of marking a todo as done See merge request !5832
| | * | | | | | | | | Rename TodoService#mark_todos_as_done_by_id{,s}Ahmad Sherif2016-08-183-5/+5
| | | | | | | | | | |
| | * | | | | | | | | Implement TodoService#mark_todos_as_done_by_idAhmad Sherif2016-08-183-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up on 52b0c26
| | * | | | | | | | | Simplify SQL queries of marking a todo as doneAhmad Sherif2016-08-182-4/+3
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'changelog-update' into 'master' Rubén Dávila Santos2016-08-181-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update changelog ## What does this MR do? Updates Changelog: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5485#note_14008742 See merge request !5854
| | * | | | | | | | Update changelogAnnabel Dunstone2016-08-171-0/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'fix/update-gitlab-git' into 'master' Yorick Peterse2016-08-183-3/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab_git gem to 10.4.7 See merge request !5851
| | * | | | | | | | | Update gitlab_git gem to 10.4.7Ahmad Sherif2016-08-183-3/+4
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'patch-3' into 'master' Drew Blessing2016-08-181-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 Buquet2016-08-181-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1852-176/+844
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'tab-persistance' into 'master' Rubén Dávila Santos2016-08-185-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 Davila2016-08-184-14/+5
| | | | | | | | |
| | * | | | | | | Fix failing testtab-persistanceAlfredo Sumaran2016-08-171-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test was not waiting for the page to be fully loaded
| | * | | | | | | Fix tabs navigation and do not update URL via pushstateAlfredo Sumaran2016-08-173-9/+15
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'doc-refactor-description-templates' into 'master' Achilleas Pipinellis2016-08-186-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' buttonAchilleas Pipinellis2016-08-182-5/+6
| | | | | | | |
| | * | | | | | Refactor description templates documentationAchilleas Pipinellis2016-08-185-14/+43
| |/ / / / / /
| * | | | | | Merge branch '18141-pipeline-graph' into 'master' Jacob Schatz2016-08-1711-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-graphAnnabel Dunstone2016-08-172-10/+12
| | | | | | |
| | * | | | | Merge master into branchAnnabel Dunstone2016-08-1760-89/+13748
| | |\ \ \ \ \
| | * | | | | | Move deployable conditional to variable; fix pipelines_specAnnabel Dunstone2016-08-172-3/+8
| | | | | | | |
| | * | | | | | Update CSS selector and play iconAnnabel Dunstone2016-08-173-4/+4
| | | | | | | |
| | * | | | | | Add deploy btn in graph; fix JS to toggle one graph at a time if multiple ↵Annabel Dunstone2016-08-174-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pipelines
| | * | | | | | Add support for Play and Created jobsKamil Trzcinski2016-08-174-35/+41
| | | | | | | |
| | * | | | | | Merge branch '18141-pipeline-graph' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-08-173-23/+75
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18141-pipeline-graph # Conflicts: # app/assets/stylesheets/pages/pipelines.scss # app/views/projects/commit/_pipeline.html.haml
| | | * | | | | | Add links to pipeline graphAnnabel Dunstone2016-08-162-1/+5
| | | | | | | | |
| | | * | | | | | Add toggle button to hide graph; set max-heightAnnabel Dunstone2016-08-163-28/+71
| | | | | | | | |
| | | * | | | | | Fix scss lint errorAnnabel Dunstone2016-08-161-2/+2
| | | | | | | | |
| | | * | | | | | Fix graph scrolling bugAnnabel Dunstone2016-08-162-9/+9
| | | | | | | | |
| | | * | | | | | Truncate build and stage namesAnnabel Dunstone2016-08-163-18/+29
| | | | | | | | |
| | | * | | | | | Add min width and horizontally scroll pipeline graph when overflowAnnabel Dunstone2016-08-161-6/+17
| | | | | | | | |
| | | * | | | | | Connect all builds in visual pipelineAnnabel Dunstone2016-08-161-8/+73
| | | | | | | | |
| | | * | | | | | Connect top level tests to each otherAnnabel Dunstone2016-08-162-5/+61
| | | | | | | | |
| | | * | | | | | Add build data to top of pipeline pageAnnabel Dunstone2016-08-162-0/+18
| | | | | | | | |
| | * | | | | | | Split pipeline status item for Commit Status and BuildKamil Trzcinski2016-08-174-15/+27
| | | | | | | | |
| | * | | | | | | Update fixtures to add a created status to pipelineKamil Trzcinski2016-08-171-5/+4
| | | | | | | | |
| | * | | | | | | Merge remote-tracking branch 'origin/master' into 18141-pipeline-graphKamil Trzcinski2016-08-17479-5035/+10514
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Update fixtures to make development testing easierKamil Trzcinski2016-08-171-6/+26
| | | | | | | | |
| | * | | | | | | Fix pipelines visualisation renderingKamil Trzcinski2016-08-173-7/+15
| | | | | | | | |
| | * | | | | | | Fix scss lint errorAnnabel Dunstone2016-08-091-2/+2
| | | | | | | | |
| | * | | | | | | Fix graph scrolling bugAnnabel Dunstone2016-08-092-9/+9
| | | | | | | | |
| | * | | | | | | Truncate build and stage namesAnnabel Dunstone2016-08-093-20/+29
| | | | | | | | |
| | * | | | | | | Add min width and horizontally scroll pipeline graph when overflowAnnabel Dunstone2016-08-091-6/+17
| | | | | | | | |
| | * | | | | | | Connect all builds in visual pipelineAnnabel Dunstone2016-08-092-23/+90
| | | | | | | | |
| | * | | | | | | Connect top level tests to each otherAnnabel Dunstone2016-08-092-19/+75
| | | | | | | | |