summaryrefslogtreecommitdiff
path: root/features/steps/project/merge_requests.rb
Commit message (Expand)AuthorAgeFilesLines
* Add DiffNote modelDouwe Maan2016-07-061-2/+1
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-061-1/+1
* Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-5/+5
|\
| * Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-5/+5
| |\
| | * Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-031-1/+1
| | |\
| | * | Incorportate feedbackZ.J. van de Weg2016-06-011-1/+1
| | * | Merge branch 'master' into awardablesZJ van de Weg2016-05-301-3/+3
| | |\ \
| | * | | Remove old tests, and use right factoriesZJ van de Weg2016-05-251-4/+4
| | * | | Merge branch 'master' into awardablesZJ van de Weg2016-05-251-1/+1
| | |\ \ \
| | * \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-111-1/+1
| | |\ \ \ \
| | * | | | | Add tests on Awardables and Award EmojiZeger-Jan van de Weg2016-05-101-5/+5
* | | | | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-031-2/+2
|/ / / / / /
* | | | | | Rename Ci::Build commit to pipelineKamil Trzcinski2016-06-031-1/+1
| |_|_|_|/ |/| | | |
* | | | | Enable Style/SpaceAfterMethodName rubocop coprubocop/enable-space-after-method-name-copGrzegorz Bizon2016-05-301-1/+1
| |_|_|/ |/| | |
* | | | Improve note factoryGrzegorz Bizon2016-05-291-1/+1
* | | | Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonotRobert Speicher2016-05-241-2/+2
| |_|/ |/| |
* | | Fix spinach testsKamil Trzcinski2016-05-141-1/+1
| |/ |/|
* | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-161-2/+2
|\ \ | |/
| * Removed references to subscribe-button CSS classPhil Hughes2016-04-121-2/+2
* | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-111-2/+6
|\ \ | |/
| * Fixed buildsPhil Hughes2016-04-061-2/+6
* | Fix specsKamil Trzcinski2016-04-111-1/+1
|/
* Tests updatePhil Hughes2016-03-311-4/+4
* Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master' Douwe Maan2016-03-151-0/+20
|\
| * Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iidRémy Coutable2016-03-081-0/+20
* | Merge branch 'comment-discard-button' into 'master' Jacob Schatz2016-03-111-3/+3
|\ \ | |/ |/|
| * Updated testsPhil Hughes2016-03-041-2/+2
| * Fixed failing comment testPhil Hughes2016-03-041-1/+1
* | Remove redundant integration testsRobert Speicher2016-03-071-8/+0
* | Indicate how much an MR branch diverges from the target branchPierre de La Morinerie2016-03-031-1/+28
|/
* Fixed failing issues testsPhil Hughes2016-02-221-2/+2
* 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/+50
* Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-lo...Rémy Coutable2016-01-201-1/+9
|\
| * Merge branch 'secret-shortcut-feature' into 'master' Dmitriy Zaporozhets2016-01-201-1/+1
| |\
| | * Fixes test to not search whole page for content.Jacob Schatz2016-01-201-1/+1
| * | Update Issues/MRs updated_at when user leaves comments.Rubén Dávila2016-01-181-0/+8
| |/
* | Fix diff comments loaded by AJAX to load comment with diff in discussion tabRémy Coutable2016-01-191-0/+31
|/
* 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
|\
| * 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
|\ \ | |/ |/|
| * 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
* Add tests for MR index pageDmitriy Zaporozhets2015-10-231-0/+13
* Fix invalid testsfix-removed-file-in-diffDmitriy Zaporozhets2015-09-301-18/+18
* Fix testsDmitriy Zaporozhets2015-09-031-1/+2
View Lorry Controller Status