summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '20808-merge-request-new-diff-view' into 'master' Robert Speicher2016-08-171-1/+18
|\ | | | | | | | | | | | | | | | | Fix merge request new view not changing code view rendering style Correctly respects the code view changing when creating a merge request. Closes #20808 See merge request !5768
| * Fix merge request new view not changing code view rendering style20808-merge-request-new-diff-viewPaco Guzman2016-08-111-1/+18
| |
* | Merge branch 'issue-boards' into 'master' Douwe Maan2016-08-171-0/+598
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue boards ## What are the relevant issue numbers? - Issue: #17907 - Issue backend: #20335 - Backend MR: !5548 - Frontend MR: !5554 - Documentation !5713 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [X] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5548
| * | Test updatePhil Hughes2016-08-171-20/+5
| | | | | | | | | | | | It wasnt testing what it was saying it should be...
| * | Fixed failing testPhil Hughes2016-08-171-0/+2
| | |
| * | Added wait for vue in logged out & guest testsPhil Hughes2016-08-171-0/+2
| | |
| * | Fixed permissions around create new list buttonPhil Hughes2016-08-171-1/+27
| | |
| * | Testing buildsPhil Hughes2016-08-171-2/+15
| | |
| * | Fix feature spec for issues boardDouglas Barbosa Alexandre2016-08-171-16/+32
| | |
| * | Updated testsPhil Hughes2016-08-171-9/+3
| | |
| * | Updated tests for creating with boardPhil Hughes2016-08-171-2/+4
| | |
| * | Tests updatedPhil Hughes2016-08-171-18/+7
| | |
| * | Tests updatePhil Hughes2016-08-171-57/+81
| | |
| * | Added vue resource interceptorPhil Hughes2016-08-171-2/+31
| | |
| * | Updated rspec to not use sleep when draggingPhil Hughes2016-08-171-1/+4
| | | | | | | | | | | | Fixed JS tests
| * | Fixed blank state nevermind buttonPhil Hughes2016-08-171-1/+1
| | |
| * | Removes checkmarks from new list dropdown when deleting listPhil Hughes2016-08-171-0/+14
| | |
| * | Fixed bug with creating new list from Backlog or done labelPhil Hughes2016-08-171-1/+23
| | |
| * | Reverted milestone upcoming default filterPhil Hughes2016-08-171-22/+21
| | |
| * | Defaults milestone filter to upcomingPhil Hughes2016-08-171-23/+24
| | |
| * | Increased scrolling speed when dragging issuePhil Hughes2016-08-171-6/+1
| | | | | | | | | | | | Fixed failing tests
| * | Hides label for current listPhil Hughes2016-08-171-22/+27
| | | | | | | | | | | | | | | | | | Added confidential icon Fixed assignee tooltip Updates some tests
| * | Added tests for infinite scrolling listsPhil Hughes2016-08-171-0/+44
| | |
| * | Fixed issue with filtering by label on issue not updating dropdownPhil Hughes2016-08-171-0/+47
| | |
| * | Added filter testsPhil Hughes2016-08-171-5/+145
| | |
| * | Added some testsPhil Hughes2016-08-171-34/+209
| | |
| * | Keeps the filters after a reloadPhil Hughes2016-08-171-1/+1
| | |
| * | Added simulate drag JS for testsPhil Hughes2016-08-171-0/+71
| | |
* | | Merge branch 'mc-ui'Douwe Maan2016-08-171-0/+72
|\ \ \ | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb
| * \ \ Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-175-50/+172
| |\ \ \ | | |/ /
| * | | Add workaround for JS error in specSean McGivern2016-08-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | These JS errors are only thrown in PhantomJS, and enough of the page is rendered properly that this spec passes. We should remove this in future.
| * | | Merge branch 'master' into mc-uiDouwe Maan2016-08-1511-34/+176
| |\ \ \
| * | | | Fix failed test because of a copy change.Fatih Acet2016-08-121-1/+1
| | | | |
| * | | | Add more tests for conflictsSean McGivern2016-08-121-0/+68
| | | | |
* | | | | Merge branch '18681-pipelines-merge-request' into 'master' Jacob Schatz2016-08-171-0/+48
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Pipelines for merge request" ## What does this MR do? Adds `Pipelines` tab in merge request view ## What are the relevant issue numbers? Closes #18681 ## Screenshots (if relevant) ![Screen_Shot_2016-08-16_at_3.22.41_PM](/uploads/c04febab3765b1fac2bf3bbfb9882f9f/Screen_Shot_2016-08-16_at_3.22.41_PM.png) See merge request !5485
| * | | | Use have_no_link to test presence of button18681-pipelines-merge-requestKamil Trzcinski2016-08-171-1/+1
| | | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Annabel Dunstone2016-08-162-9/+109
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 18681-pipelines-merge-request
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Annabel Dunstone2016-08-162-197/+60
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 18681-pipelines-merge-request
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-08-1662-302/+1058
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 18681-pipelines-merge-request
| * | | | | | | Use merge_request_diff instead of doubles for testing pipelines for Merge ↵Kamil Trzcinski2016-08-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requests
| * | | | | | | Add a feature tests to check if a view can be rendered properlyKamil Trzcinski2016-08-121-0/+48
| | | | | | | |
* | | | | | | | Merge branch 'file-content-highlight-line' into 'master' Jacob Schatz2016-08-162-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlight empty lines ## What does this MR do? Rather than just highlight the text, file line highlighting now highlights the full line including empty lines ## What are the relevant issue numbers? Closes #19484 ## Screenshots (if relevant) ![Screen_Shot_2016-07-05_at_13.52.31](/uploads/d3bddc918d731681465381e96c0aa2b0/Screen_Shot_2016-07-05_at_13.52.31.png) See merge request !5092
| * | | | | | | Highlight empty linesPhil Hughes2016-07-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19484
* | | | | | | | Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-161-0/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load issue templates from repository part of #18656 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4981
| * | | | | | | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-161-0/+89
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-162-197/+60
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-161-38/+60
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'fix/import-permissions' into 'master' Douwe Maan2016-08-151-38/+60
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set permissions to admin for importing a project via Import/Export Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20802 In order to import a project, it is now required to be an admin Moved from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5766 See merge request !1983
| | | * | | | | | | Fix permissions check in controller, added relevant spec and updated docsJames Lopez2016-08-111-38/+60
| | | | |_|_|_|_|/ | | | |/| | | | |
| * | | | | | | | Revert "Merge branch ↵Rubén Dávila Santos2016-08-161-159/+0
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'" This reverts merge request !5417
View Lorry Controller Status