summaryrefslogtreecommitdiff
path: root/features/project/merge_requests.feature
Commit message (Expand)AuthorAgeFilesLines
* Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuableStan Hu2016-07-131-1/+1
* Optimistic locking for Issue and Merge RequestsValery Sizov2016-07-121-1/+1
* Updated testsPhil Hughes2016-07-051-7/+0
* Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-12/+0
|\
| * Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-12/+0
* | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttonsAlejandro Rodríguez2016-06-061-2/+0
|/
* Fixed buildsPhil Hughes2016-04-061-0/+1
* Added testPhil Hughes2016-03-181-0/+8
* Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iidRémy Coutable2016-03-081-1/+8
* Remove redundant integration testsRobert Speicher2016-03-071-19/+0
* Indicate how much an MR branch diverges from the target branchPierre de La Morinerie2016-03-031-0/+10
* Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-171-0/+11
* Fix the "x of y" displayed at the top of Issuables' sidebarfix/13356-issuable-index-of-total-in-sidebarRémy Coutable2016-02-151-0/+1
* Make default sorting preference work for Issues and MRs.issue_5546Rubén Dávila2016-01-221-0/+7
* Merge branch 'master' into issue_5546Rubén Dávila2016-01-221-0/+11
|\
| * Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-lo...Rémy Coutable2016-01-201-0/+19
| |\
| * | Fix diff comments loaded by AJAX to load comment with diff in discussion tabRémy Coutable2016-01-191-0/+11
* | | Make sorting preference reusable for all projects.Rubén Dávila2016-01-221-0/+7
* | | Little refactor plus some specs.Rubén Dávila2016-01-211-0/+8
| |/ |/|
* | Update Issues/MRs updated_at when user leaves comments.Rubén Dávila2016-01-181-0/+19
|/
* Remove note from MR discussion when deleting it in the changes tabDouglas Barbosa Alexandre2015-12-101-0/+10
* Merge branch 'master' into fix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-091-0/+1
|\
| * Tag feature specsDouwe Maan2015-12-091-0/+1
* | Ensure notes are replaced on a merge request diff when they're updatedDouglas Barbosa Alexandre2015-12-091-0/+10
|/
* Display target branch on MR list when it is different from project's defaultAnton Baklanov2015-11-101-0/+9
* Add tests for MR index pageDmitriy Zaporozhets2015-10-231-0/+6
* Fix invalid testsfix-removed-file-in-diffDmitriy Zaporozhets2015-09-301-18/+18
* Fix merge request diff featuresrs-issue-1887Robert Speicher2015-06-251-8/+8
* Fix downloading of patches on public merge requests when user logged outStan Hu2015-06-231-0/+12
* Revert merge request states renamingDmitriy Zaporozhets2015-06-191-1/+1
* Support editing target branch of merge requestStan Hu2015-05-291-0/+8
* Update specs.accepted-rejected-mrsDouwe Maan2015-05-251-2/+2
* Remove feature tests for old task listsRobert Speicher2015-05-061-32/+0
* Fix broken side-by-side diff view on merge request pageStan Hu2015-03-251-0/+7
* testsValery Sizov2015-03-161-0/+7
* Implement merge requests searchDmitriy Zaporozhets2015-03-121-0/+7
* Fix more Markdown preview testsVinnie Okada2014-10-181-4/+4
* Refactor Markdown preview testsVinnie Okada2014-10-181-4/+4
* Add Markdown preview to more formsVinnie Okada2014-10-151-0/+31
* Merge pull request #7979 from mr-vinn/refactor-tasksDmitriy Zaporozhets2014-10-081-2/+1
|\
| * Refactor task list tests and coffeescriptVinnie Okada2014-10-061-2/+1
* | Merge pull request #7964 from mr-vinn/task-listsMarin Jankovski2014-10-061-0/+33
|\ \ | |/
| * Add Spinach tests for task listsVinnie Okada2014-10-061-0/+33
* | Preventing some duplication in MR feature tests by adding a different comment.Marin Jankovski2014-10-061-4/+2
|/
* Add one feature test.Marin Jankovski2014-09-121-0/+10
* diff unfoldskv2014-08-141-0/+8
* Fix MR testsDmitriy Zaporozhets2014-07-311-7/+7
* Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitl...Dmitriy Zaporozhets2014-03-131-0/+44
|\
| * Add button for toggling inline comments in diff view.Jacob Carlborg2014-02-221-0/+44
* | Add tests to reopen MRDmitriy Zaporozhets2014-03-031-0/+7
|/