aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/merges_controller.rb
AgeCommit message (Expand)Author
2018-04-16Refs #6476 Add merge permissions6476-merge-permissionscedricnjanga
2018-01-11Add Referential#merged_at and make Referentials archived and merged. Refs #5559Alban Peignier
2018-01-10Define and display Merge#creator. Refs #5299Alban Peignier
2018-01-05Disable PolicyChecker in MergesController. Refs #5299Alban Peignier
2018-01-05Ignore referential in referential suite for mergeable referentials. Refs #5299Alban Peignier
2018-01-05Create first merge interface. Refs #5299Alban Peignier