kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec/models
History
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
..
ci Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
concerns Render canceled status if any of the jobs canceled 2016-04-27 14:16:01 +02:00
hooks Backported minimal safewebhook implementation to GitLab CE 2016-04-30 05:04:10 -03:00
members Tag model specs 2015-12-09 10:50:51 +01:00
project_services Ensure URL in all Service subclasses are valid 2016-04-25 15:28:24 -04:00
abuse_report_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
appearance_spec.rb Branded login page also in CE 2016-02-26 15:50:51 +01:00
application_setting_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
blob_spec.rb Add a `Blob` model that wraps `Gitlab::Git::Blob` 2016-02-18 22:45:30 -05:00
broadcast_message_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
build_spec.rb Remove code that removes duplicate CI variables 2016-04-18 13:17:48 +02:00
commit_range_spec.rb Tag model specs 2015-12-09 10:50:51 +01:00
commit_spec.rb Rename CiStatus to Statusable 2016-04-16 21:46:26 +02:00
commit_status_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
deploy_key_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
deploy_keys_project_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
email_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
event_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
external_issue_spec.rb Hide number sign for string prefixed external issues 2016-04-12 10:01:52 +02:00
forked_project_link_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
generic_commit_status_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
global_milestone_spec.rb Fix Error 500 when global milestones have slashes 2015-12-22 13:15:32 -08:00
group_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
identity_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
issue_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
jira_issue_spec.rb Backport JIRA service 2015-12-18 14:19:48 -06:00
key_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
label_link_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
label_spec.rb Merge branch 'remove-annotate-gem' into 'master' 2016-05-10 09:08:30 +00:00
member_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
merge_request_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
milestone_spec.rb Merge branch 'remove-annotate-gem' into 'master' 2016-05-10 09:08:30 +00:00
namespace_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
note_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
notification_setting_spec.rb Add spec for user_id uniq in NotificationSetting model 2016-03-30 10:44:20 +02:00
project_group_link_spec.rb Bring ProjectGroupLink model and migrations from EE 2016-03-11 17:47:05 +01:00
project_security_spec.rb Fix some specs 2016-03-20 22:55:08 +01:00
project_snippet_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
project_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
project_team_spec.rb Bring shared project feature tests from EE 2016-03-12 14:45:14 +01:00
project_wiki_spec.rb Revert "Merge branch 'wiki-fix' into 'master' " 2016-05-10 10:57:48 +02:00
protected_branch_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
release_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
repository_spec.rb Merge branch 'use-rugged-to-create-tag' into 'master' 2016-05-04 16:07:13 +00:00
service_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
snippet_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
spam_log_spec.rb Refactor Admin::SpamLogsController to block user before destroying 2016-02-02 11:25:44 -02:00
todo_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
tree_spec.rb Prioritize previewable over plain README files 2016-01-25 11:27:07 -02:00
user_spec.rb Remove the annotate gem and delete old annotations 2016-05-09 18:00:28 +02:00
wiki_page_spec.rb Fix old version warning when viewing wiki latest version via version_id 2016-01-29 14:17:00 -02:00