3 commits

Author	SHA1	Message	Date
Annabel Dunstone Gray	06a2e3854e	Make it explicit that merge conflict feature commits to source branch	2018-05-21 11:36:54 -07:00
Takuya Noguchi	2b6307f6ad	Enable RuboCop Style/RegexpLiteral	2018-02-01 02:06:07 +09:00
Rémy Coutable	799cd47109	Improve MR feature specs and reduce duplication ... Signed-off-by: Rémy Coutable <remy@rymai.me>	2018-01-18 15:07:57 +01:00

Renamed from spec/features/merge_requests/conflicts_spec.rb (Browse further)