Rémy Coutable 3af78b5c53 Merge branch 'revert-4026' into 'master' ... Revert "Merge branch 'wiki-fix' into 'master'" This reverts commit 4cc85a58e8 (!4026), reversing changes made to 90ae445ba9. From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4026#note_11719950: > 1. On Ruby 2.1.x, the [`uri.path = ::File.join(project_wiki_base_path, uri.path)`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/banzai/filter/wiki_link_filter.rb#L39) raises an `URI::InvalidComponentError: bad component(expected relative path component): http://bar.com/baz` error in `Banzai::Filter::WikiLinkFilter#rebuild_wiki_uri`, which is then rescued in [`Banzai::Filter::WikiLinkFilter#process_link_attr`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/banzai/filter/wiki_link_filter.rb#L34), thus the link is not modified and the tests pass. 1. On Ruby 2.2.x, the same line doesn't raise an error anymore, thus tests are broken on Ruby 2.2 only. I didn't really understand yet why having absolute links in the wiki would break some tests vs having relative links as before, but I think the safest course to action is to revert this MR and to find another fix (probably just prepending `ProjectWiki#wiki_base_path` with the relative URL path component if we are in the case of a relative URL... /cc @artem-sidorenko Just a FYI note: no need to pick into `8-7-stable` since the original commit was not picked. See merge request !4105		2016-05-10 09:47:55 +00:00
..
api	Expose MergeRequest#user_notes_count in the API and use the method in issues list	2016-05-09 16:08:07 +02:00
assets	…
backup	…
banzai	Links for redmine issue references are generated correctly again	2016-05-10 00:37:15 +02:00
ci	Fix some typos	2016-04-22 22:08:38 +02:00
gitlab	Revert "Merge branch 'wiki-fix' into 'master' "	2016-05-10 10:57:48 +02:00
omni_auth	…
rouge/formatters	…
support	Replace gitlab-workhorse with GitLab Workhorse where appropriate	2016-04-28 17:36:50 +03:00
tasks	Merge branch 'remove-annotate-gem' into 'master'	2016-05-10 09:08:30 +00:00
award_emoji.rb	Removed usage of normilizeEmojiName method	2016-04-22 21:53:26 +01:00
banzai.rb	…
disable_email_interceptor.rb	…
event_filter.rb	…
extracts_path.rb	…
file_size_validator.rb	Get rid of more requires, which causes warnings when code is reloaded	2016-04-19 11:48:10 +02:00
file_streamer.rb	…
gitlab.rb	…
gt_one_coercion.rb	…
repository_cache.rb	…
static_model.rb	…
unfold_form.rb	…
uploaded_file.rb	…
version_check.rb	…