about summary refs log tree commit diff
path: root/app/views/settings
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-11-16 22:52:37 -0600
committerDavid Yip <yipdw@member.fsf.org>2017-11-16 22:52:37 -0600
commitb28b405b9763a0bb3df653b51e6d084b42e9a54d (patch)
treec69f1ccb99440fea8cc94014e77687238e205160 /app/views/settings
parentee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (diff)
parentdc6e031364d1f47a49ea47f20070a4e9986a4c68 (diff)
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/views/settings')
-rw-r--r--app/views/settings/applications/new.html.haml2
-rw-r--r--app/views/settings/applications/show.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/settings/applications/new.html.haml b/app/views/settings/applications/new.html.haml
index 5274a430c..aa2281fea 100644
--- a/app/views/settings/applications/new.html.haml
+++ b/app/views/settings/applications/new.html.haml
@@ -3,6 +3,6 @@
 
 = simple_form_for @application, url: settings_applications_path do |f|
   = render 'fields', f: f
-  
+
   .actions
     = f.button :button, t('doorkeeper.applications.buttons.submit'), type: :submit
diff --git a/app/views/settings/applications/show.html.haml b/app/views/settings/applications/show.html.haml
index 12baed088..390682d6f 100644
--- a/app/views/settings/applications/show.html.haml
+++ b/app/views/settings/applications/show.html.haml
@@ -25,7 +25,7 @@
 
 = simple_form_for @application, url: settings_application_path(@application), method: :put do |f|
   = render 'fields', f: f
-    
+
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit