Robert Speicher 75ed0e27d9 Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master' ... Handle non-UTF-8 conflicts gracefully ## What does this MR do? If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI. ## What are the relevant issue numbers? Closes #21247. See merge request !5961		2016-08-25 19:08:38 +00:00
..
award_spec.rb	fixes part1 of files to start using active tense	2016-08-09 15:06:23 +01:00
cherry_pick_spec.rb	Add tests	2016-04-20 14:28:43 +02:00
conflicts_spec.rb	Handle non-UTF-8 conflicts gracefully	2016-08-25 08:27:08 +01:00
create_new_mr_spec.rb	Refactor to mark Changes tab as active on new MR page.	2016-08-18 07:33:27 -05:00
created_from_fork_spec.rb	Pre-create all builds for Pipeline when a trigger is received	2016-08-11 15:22:35 +02:00
diff_notes_resolve_spec.rb	Add test for jumping between discussions and unhiding toggled discussions.	2016-08-16 10:17:47 -06:00
diff_notes_spec.rb	Added unfold test to parallel and added 'diff discussion' context	2016-08-23 20:45:29 +01:00
diffs_spec.rb	Moved notes scenarios to 'diff_notes_spec.rb'	2016-08-05 13:56:26 +01:00
edit_mr_spec.rb	Revert the revert of Optimistic Locking	2016-08-22 18:43:13 +03:00
filter_by_milestone_spec.rb	fixes part1 of files to start using active tense	2016-08-09 15:06:23 +01:00
merge_request_versions_spec.rb	Refactor MergeRequestDiff initialize method	2016-08-02 13:31:19 +03:00
merge_when_build_succeeds_spec.rb	fixes part1 of files to start using active tense	2016-08-09 15:06:23 +01:00
only_allow_merge_if_build_succeeds.rb	Rename MergeRequest methods that return commits or shas to be more clear and consistent	2016-07-06 18:50:58 -04:00
pipelines_spec.rb	Use have_no_link to test presence of button	2016-08-17 14:49:16 +01:00
toggle_whitespace_changes.rb	Syntax and code improvements	2016-04-26 14:01:40 -05:00
user_lists_merge_requests_spec.rb	State specific default sort order for issuables	2016-08-01 11:28:56 +02:00
user_uses_slash_commands_spec.rb	Remove unneeded aliases	2016-08-18 14:29:48 -05:00