summaryrefslogtreecommitdiff
path: root/features/steps/project/merge_requests.rb
Commit message (Collapse)AuthorAgeFilesLines
* Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-161-2/+2
|
* Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-141-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
| * Migrate CI::Project to ProjectKamil Trzcinski2015-12-111-1/+1
| |
* | Remove note from MR discussion when deleting it in the changes tabDouglas Barbosa Alexandre2015-12-101-0/+19
| |
* | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' Robert Speicher2015-12-101-0/+25
|\ \ | |/ |/| | | | | | | | | Fix editing notes on a merge request diff Fixes #3910 See merge request !2041
| * Ensure notes are replaced on a merge request diff when they're updatedDouglas Barbosa Alexandre2015-12-091-0/+25
| |
* | Use "Build passed" in tooltip instead of "Build status: passed"Douwe Maan2015-12-081-1/+1
|/
* Add cancel button to forms that didn't have one alreadyDouwe Maan2015-12-021-1/+1
|
* Display target branch on MR list when it is different from project's defaultAnton Baklanov2015-11-101-0/+20
|
* Fix rubocop issuesci-status-mr-indexDmitriy Zaporozhets2015-10-231-5/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add tests for MR index pageDmitriy Zaporozhets2015-10-231-0/+13
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix invalid testsfix-removed-file-in-diffDmitriy Zaporozhets2015-09-301-18/+18
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix testsDmitriy Zaporozhets2015-09-031-1/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix testsDmitriy Zaporozhets2015-09-031-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-111-1/+1
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'check-out-branch-button' into 'master' Dmitriy Zaporozhets2015-08-111-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Check out branch" button to the MR page. I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120. ![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png) It looks even better in combination with !1121, which gets rid of the "If you want to ..." line: ![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png) cc @dzaporozhets @rspeicher See merge request !1116
| | * Fix specDouwe Maan2015-08-101-1/+1
| | |
* | | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-5/+0
|/ / | | | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* | Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-0/+5
|/ | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove satellitesDmitriy Zaporozhets2015-07-151-5/+0
|
* Merge branch 'rs-fix-subscription-feature' into 'master'Dmitriy Zaporozhets2015-06-291-2/+2
|\ | | | | | | | | | | | | | | | | Attempt to fix the "I should see that I am [un]subscribed" steps Makes use of Capybara methods that wait. Hopefully this will fix the random timing-related failures of this step. See merge request !853
| * Attempt to fix the "I should see that I am [un]subscribed" stepsrs-fix-subscription-featureRobert Speicher2015-06-251-2/+2
| | | | | | | | | | Makes use of Capybara methods that wait. Hopefully this will fix the random timing-related failures of this step.
* | Fix merge request diff featuresrs-issue-1887Robert Speicher2015-06-251-12/+6
|/
* Fix downloading of patches on public merge requests when user logged outStan Hu2015-06-231-0/+22
| | | | | | Closes #1225 Closes #1854 Closes #1858
* Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-221-4/+4
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
| * Revert merge request states renamingDmitriy Zaporozhets2015-06-191-4/+4
| | | | | | | | | | | | | | | | Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix features syntaxRobert Speicher2015-06-221-14/+21
|/
* Call `page.all` instead of `all` in feature stepsRobert Speicher2015-06-121-1/+1
| | | | | | | There's a naming conflict between Capybara and rspec-matchers which both define the `all` method. See https://github.com/jnicklas/capybara/issues/1396
* Change `within` to `page.within` in feature stepsRobert Speicher2015-06-121-19/+19
|
* Update all `should`-style syntax to `expect` in featuresRobert Speicher2015-06-121-32/+32
|
* Fix test for accept merge requestDmitriy Zaporozhets2015-06-121-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix merge request testrefactor-mr-widgetDmitriy Zaporozhets2015-06-111-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Support editing target branch of merge requestStan Hu2015-05-291-0/+14
| | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/7105 See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
* Persist current merge request tab selection via URLrs-persist-tab-selectionRobert Speicher2015-05-271-1/+4
| | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
* Update specs.accepted-rejected-mrsDouwe Maan2015-05-251-4/+4
|
* Remove feature tests for old task listsRobert Speicher2015-05-061-4/+0
|
* Fix testsrefactor-mr-formDmitriy Zaporozhets2015-05-061-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove timing dependency on testStan Hu2015-04-141-2/+1
| | | | See: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara
* Fix broken side-by-side diff view on merge request pageStan Hu2015-03-251-0/+14
| | | | Closes #1294
* Add tooltip for comment toggle in diff. Add changelog item and fix testsDmitriy Zaporozhets2015-03-181-2/+2
|
* improve UIValery Sizov2015-03-171-2/+2
|
* testsValery Sizov2015-03-161-0/+13
|
* Implement merge requests searchDmitriy Zaporozhets2015-03-121-0/+4
| | | | | | | It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues
* Make test element selection more specific.Douwe Maan2015-02-251-3/+3
|
* Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-191-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml
| * Make sure Markdown previews always use the same styling as the eventual ↵Douwe Maan2015-02-171-2/+2
| | | | | | | | destination.
* | Upgrade to Rails 4.1.9Vinnie Okada2015-02-141-2/+2
|/ | | | | | Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
* Fix test for merge requestDmitriy Zaporozhets2015-01-281-1/+3
|
* Fix testsDmitriy Zaporozhets2015-01-161-2/+2
|
* Fix randomly failing testDmitriy Zaporozhets2015-01-101-1/+1
|
View Lorry Controller Status