summaryrefslogtreecommitdiff
path: root/lib/gitlab/satellite/merge_action.rb
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-146/+0
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-0/+146
* Remove satellitesDmitriy Zaporozhets2015-07-151-146/+0
* Enable more rubocop style checksDmitriy Zaporozhets2015-03-241-1/+1
* Rubocop enabled for: Use spaces inside hash literal bracesDmitriy Zaporozhets2015-02-021-3/+3
* Fix satellitesDmitriy Zaporozhets2014-09-251-8/+14
* Fix satellite testsDmitriy Zaporozhets2014-08-061-6/+9
* Dont show 'Remove source brnach' checkbox for forkDmitriy Zaporozhets2014-07-041-1/+2
* Fix extra space added in beginning of commit messageawiddersheim2014-02-241-1/+1
* Add merge_commit_message argument for Satellite::MergeAction#mergeDmitriy Zaporozhets2014-01-131-9/+4
* Use same code for diff and patch inside MergeActionDmitriy Zaporozhets2014-01-131-16/+2
* Add support of custom message to merge action of satelliteDmitriy Zaporozhets2014-01-131-15/+12
* Remove gitolite mentionDmitriy Zaporozhets2013-11-191-1/+1
* Remove outdated comments.Marin Jankovski2013-10-041-2/+0
* Fix failed merge when filename is the same as target branchname.Marin Jankovski2013-10-041-1/+1
* Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karl...Dmitriy Zaporozhets2013-08-081-2/+2
|\
| * Removed some debug codeIzaak Alpert2013-07-301-2/+0
| * Updated format_patch to use '..' rather than '...'Izaak Alpert2013-07-301-2/+4
* | Remove ugly button and truncate too long project names. Remove unecessary new...Dmitriy Zaporozhets2013-07-301-3/+5
|/
* Raise Error for diff_between/commit_between for non fork mr's in satelliteIzaak Alpert2013-07-171-4/+2
* MR on fork: Email fixes, style fixesIzaak Alpert2013-07-171-3/+0
* MR on fork: Some cleanup, test updatesIzaak Alpert2013-07-171-15/+9
* MR on Fork multiple fixesIzaak Alpert2013-07-171-2/+4
* Merge Request on forked projectsIzaak Alpert2013-07-171-14/+110
* Fix branch remove on automergeDmitriy Zaporozhets2013-01-171-1/+1
* Continue refactoring. Use repostory and teamDmitriy Zaporozhets2013-01-041-1/+1
* Update satellite action docsRiyad Preukschas2012-10-261-0/+2
* Fix timeouts in MergeActionRiyad Preukschas2012-10-261-4/+4
* Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileActionRiyad Preukschas2012-10-261-2/+2
* Change argument order for satellite actions to always start with the userRiyad Preukschas2012-10-261-2/+2
* Move prepare_satellite! to Gitlab::Satelite::ActionRiyad Preukschas2012-10-261-16/+2
* Renamed Gitlab::Merge to Gitlab::Satellite::MergeActionRiyad Preukschas2012-10-261-0/+83
View Lorry Controller Status