summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/merge_service_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Don't use Gitlab::Utils.nlbr in Gitlab::GitJacob Vosmaer (GitLab)2018-06-111-1/+1
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-13/+47
* Save and expose only generic merge errorJan Provaznik2018-05-021-2/+2
* Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-141-4/+4
* Prevent fast forward merge when rebase is requiredissue_39773_beFelipe Artur2017-11-101-0/+22
* Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-271-49/+0
* add specmicael.bergeron2017-10-111-7/+16
* Clean merge_jid whenever necessary on the merge process38476-improve-merge-jid-cleanup-on-merge-processOswaldo Ferreira2017-09-271-3/+20
* Cleans merge_jid when possible on MergeService36114-stuck-mrs-job-follow-upOswaldo Ferreira2017-08-281-5/+28
* Track enqueued and ongoing MRsOswaldo Ferreira2017-08-281-0/+9
* Move GitHooksService to Gitlab::GitJacob Vosmaer2017-08-231-1/+1
* Use described_class when possibleRémy Coutable2017-07-271-7/+7
* Remove superfluous lib: true, type: redis, service: true, models: true, servi...Rémy Coutable2017-07-271-1/+1
* Prevent accidental deletion of protected MR source branch by repeating checks...dm-always-verify-source-branch-can-be-deletedDouwe Maan2017-07-041-11/+58
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-3/+3
* Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-141-1/+3
* Show merge errors in merge request widgetSean McGivern2017-02-161-9/+20
* Refactor JiraService by moving code out of JiraService#execute methodclean-up-jira-serviceAdam Niedzielski2016-12-011-1/+1
* Rephrase some system notes to be compatible with new system note stylerephrase-system-notesDouwe Maan2016-11-241-1/+1
* Allow enabling and disabling commit and MR events for JIRAissue_5541Felipe Artur2016-11-181-0/+16
* Add JIRA remotelinks and prevent duplicated closing messagesFelipe Artur2016-11-181-2/+4
* Prevent wrong markdown on issue ids when project has Jira service activatedissue_828Felipe Artur2016-10-191-0/+12
* Improve error logging of MergeServiceStan Hu2016-10-181-2/+2
* Add markdown cache columns to the database, but don't use them yetNick Thomas2016-10-071-1/+4
* Fix bug when trying to cache closed issues from external issue trackersissue_22446Felipe Artur2016-10-031-0/+36
* Close todos when accepting a MR via the API.Tony Gambone2016-09-291-0/+24
* adds second batch of tests changed to active tenseactive-tense-test-coveragetiagonbotelho2016-08-091-2/+2
* Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-291-0/+11
* Avoid `describe`-ing symbols in specsrs-describe-symbolsRobert Speicher2016-07-121-1/+1
* Handle custom Git hook result in GitLab UIValery Sizov2016-07-041-0/+10
* Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-201-0/+15
* Merge branch 'master' into split-up-buildsDouwe Maan2015-12-091-4/+5
|\
| * Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-071-1/+3
| |\
| * | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-021-4/+4
* | | Tag service specsDouwe Maan2015-12-091-1/+1
| |/ |/|
* | test fixValery Sizov2015-11-301-2/+3
|/
* Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-011-0/+14
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-5/+0
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-0/+5
* Fix merge request creation without branch selectedDmitriy Zaporozhets2015-08-051-5/+0
* Updated rspec to rspec 3.x syntaxJeroen van Baarsen2015-02-121-6/+6
* Add action property to merge request hookjubianchi2015-01-201-0/+44
View Lorry Controller Status