From 10314ffc8c12260df7aaee22113e2d30eed9d3a5 Mon Sep 17 00:00:00 2001
From: augier <christophe@c-henry.fr>
Date: Mon, 23 Nov 2015 10:41:40 +0100
Subject: [PATCH] Fixing more remarks
---
.../api/openid_connect/authorizations/_grants_list.haml | 6 +++---
config/initializers/cors.rb | 2 +-
config/locales/diaspora/en.yml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/views/api/openid_connect/authorizations/_grants_list.haml b/app/views/api/openid_connect/authorizations/_grants_list.haml
index 4540870445..63d59211f0 100644
--- a/app/views/api/openid_connect/authorizations/_grants_list.haml
+++ b/app/views/api/openid_connect/authorizations/_grants_list.haml
@@ -10,7 +10,7 @@
%ul
- app.scopes.each do |scope|
%li
- %b= t("api.openid_connect.scopes.#{scope}.name")
+ %strong= t("api.openid_connect.scopes.#{scope}.name")
%p= t("api.openid_connect.scopes.#{scope}.description")
- else
.well
@@ -19,13 +19,13 @@
.small-horizontal-spacer
.application-tos-policy
- if app.terms_of_services?
- %b= link_to t("api.openid_connect.user_applications.tos"), app.terms_of_services
+ %strong= link_to t("api.openid_connect.user_applications.tos"), app.terms_of_services
- if app.policy? && app.terms_of_services?
|
- if app.policy?
- %b= link_to t("api.openid_connect.user_applications.policy"), app.policy
+ %strong= link_to t("api.openid_connect.user_applications.policy"), app.policy
- if app.policy? || app.terms_of_services?
.small-horizontal-spacer
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 6ca623de52..9ad8a18a53 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -6,6 +6,6 @@ Rails.application.config.middleware.insert 0, Rack::Cors do
resource "/.well-known/webfinger"
resource "/.well-known/openid-configuration"
resource "/api/openid_connect/user_info", methods: %i(get post)
- resource "/api/v0/*", methods: %i(get post delete)
+ resource "/api/v0/*", methods: %i(delete get post)
end
end
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index b6dee2b3f4..349c027dfc 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -893,7 +893,7 @@ en:
bad_request: "Missing client id or redirect URI"
client_id_not_found: "No client with client_id %{client_id} with redirect URI %{redirect_uri} found"
destroy:
- fail: "The attempt to revoke the authorization with ID %{id} has failed"
+ fail: "The attempt to revoke the authorization with ID %{id} failed"
user_applications:
index:
edit_applications: "Applications"
@@ -902,7 +902,7 @@ en:
no_requirement: "%{name} requires no permissions"
no_applications: "You have no authorized applications"
revoke_autorization: "Revoke"
- tos: "See the application's ToS"
+ tos: "See the application's terms of service"
policy: "See the application's privacy policy"
scopes:
openid:
--
GitLab