hiera/roles/web/redirect/eyeo.yaml - Issue 29795555: #11738 - Add redirects for Acceptable Ads optout and ABP terms

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: hiera/roles/web/redirect/eyeo.yaml

Issue 29795555: #11738 - Add redirects for Acceptable Ads optout and ABP terms (Closed)

Patch Set: Created May 31, 2018, 10:47 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

« no previous file with comments | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 classes:	1 classes:

2 adblockplus::web::redirector:	2 adblockplus::web::redirector:

3 domain: "eyeo.to"	3 domain: "eyeo.to"

4 default: "https://eyeo.com/"	4 default: "https://eyeo.com/"

5	5

6 adblockplus::web::redirector::targets:	6 adblockplus::web::redirector::targets:

7 acceptableads: "https://acceptableads.com/"	7 acceptableads: "https://acceptableads.com/"

8 adblockbrowser: "https://adblockbrowser.org/"	8 adblockbrowser: "https://adblockbrowser.org/"

9 adblockbrowser/android: "https://play.google.com/store/apps/details?id=org.adb lockplus.browser"	9 adblockbrowser/android: "https://play.google.com/store/apps/details?id=org.adb lockplus.browser"

10 adblockbrowser/ios: "https://itunes.apple.com/app/adblock-browser-best-ad-bloc ker/id1015653330"	10 adblockbrowser/ios: "https://itunes.apple.com/app/adblock-browser-best-ad-bloc ker/id1015653330"

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48 adblockplus/social_renren: "http://www.renren.com/601651969?"	48 adblockplus/social_renren: "http://www.renren.com/601651969?"

49 adblockplus/social_twitter: "https://twitter.com/adblockplus?"	49 adblockplus/social_twitter: "https://twitter.com/adblockplus?"

50 adblockplus/social_weibo: "http://e.weibo.com/adblockplus/?"	50 adblockplus/social_weibo: "http://e.weibo.com/adblockplus/?"

51 adblockplus/sbrowser_samsung_internet_store/google_play: "https://play.google. com/store/apps/details?id=com.sec.android.app.sbrowser"	51 adblockplus/sbrowser_samsung_internet_store/google_play: "https://play.google. com/store/apps/details?id=com.sec.android.app.sbrowser"

52 adblockplus/sbrowser_samsung_internet_store/galaxy_apps: "https://apps.samsung .com/appquery/appDetail.as?appId=com.sec.android.app.sbrowser"	52 adblockplus/sbrowser_samsung_internet_store/galaxy_apps: "https://apps.samsung .com/appquery/appDetail.as?appId=com.sec.android.app.sbrowser"

53 adblockplus/sbrowser_samsung_internet_store/app_store_360: "http://zhushou.360 .cn/detail/index/soft_id/3248635?recrefer=SE_D_三星浏览器"	53 adblockplus/sbrowser_samsung_internet_store/app_store_360: "http://zhushou.360 .cn/detail/index/soft_id/3248635?recrefer=SE_D_三星浏览器"

54 adblockplus/sbrowser_samsung_internet_store/baidu: "https://shouji.baidu.com/s oftware/22835675.html"	54 adblockplus/sbrowser_samsung_internet_store/baidu: "https://shouji.baidu.com/s oftware/22835675.html"

55 adblockplus/sbrowser_samsung_internet_store/tencent: "http://sj.qq.com/myapp/d etail.htm?apkName=com.sec.android.app.sbrowser"	55 adblockplus/sbrowser_samsung_internet_store/tencent: "http://sj.qq.com/myapp/d etail.htm?apkName=com.sec.android.app.sbrowser"

56 adblockplus/sbrowser_samsung_internet_store: "https://www.samsung.com/de/apps/ samsung-internet/"	56 adblockplus/sbrowser_samsung_internet_store: "https://www.samsung.com/de/apps/ samsung-internet/"

57 adblockplus/help_center: "https://help.eyeo.com/"	57 adblockplus/help_center: "https://help.eyeo.com/"

58	58 adblockplus/acceptable_ads_opt_out: "https://adblockplus.org/acceptable-ads#op tout"

	59 adblockplus/terms: "https://adblockplus.org/terms"
	f.lopez 2018/05/31 19:17:38 will you remove the new line at the end of the fil will you remove the new line at the end of the file too? mathias 2018/06/01 07:41:22 Yes, in this case actually by intention. Objection Show quoted text On 2018/05/31 19:17:38, f.lopez wrote: > will you remove the new line at the end of the file too? Yes, in this case actually by intention. Objections?
OLD	NEW