Rémy Coutable ae83801cd5 Merge branch 'fix/import-error' into 'master' ... Fix Import/Export error checking versions Fixes small bug preventing the correct error message about Import/Export version being displayed. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20536 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5638		2016-08-04 10:09:18 +00:00
..
config	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
controllers	Move to Gitlab::Diff::FileCollection	2016-08-03 07:00:20 +02:00
factories	Merge branch 'zj-env-external-url' into 'master'	2016-08-01 09:04:09 +00:00
features	Fix search results for notes without commits	2016-08-01 11:53:12 -03:00
finders	Add failing test for #20462	2016-08-02 03:32:28 +02:00
fixtures	Merge remote-tracking branch 'upstream/master' into new-issue-by-email	2016-07-26 14:51:52 +08:00
helpers	switch from diff_file_collection to diffs	2016-08-03 07:00:20 +02:00
initializers	Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.	2016-07-31 15:36:11 -04:00
javascripts	ES6ify all the things!	2016-07-24 23:45:11 +03:00
lib	Merge branch 'fix/import-error' into 'master'	2016-08-04 10:09:18 +00:00
mailers	Introduce Compare model in the codebase.	2016-08-03 07:00:20 +02:00
models	change the API on the merge_request_diff model from diffs -> raw_diffs	2016-08-03 23:32:12 +02:00
requests	switch from diff_file_collection to diffs	2016-08-03 07:00:20 +02:00
routing	Add failing test for #20462	2016-08-02 03:32:28 +02:00
services	switch from diff_file_collection to diffs	2016-08-03 07:00:20 +02:00
support	Add failing test for #20462	2016-08-02 03:32:28 +02:00
tasks/gitlab	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
uploaders	Remove VideoJS and clean the integration	2016-07-20 11:36:42 +02:00
views	Add failing test for #20462	2016-08-02 03:32:28 +02:00
workers	Fix skip_repo parameter being ignored when destroying a namespace	2016-08-03 17:07:38 -07:00
factories_spec.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
rails_helper.rb
simplecov_env.rb	Introduce SimpleCovEnv singleton helper and use it	2016-07-21 12:46:49 +02:00
spec_helper.rb	Introduce SimpleCovEnv singleton helper and use it	2016-07-21 12:46:49 +02:00
teaspoon_env.rb	Removed coffee matchers	2016-07-29 00:19:50 +01:00