diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:09:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 23:09:53 +0100 |
| commit | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (patch) | |
| tree | a225407cb43edf3fa9d9ac0100021a380e11ff91 /app/views/settings | |
| parent | 6a0ed45aa3f11f0343a7be556b36b4d075ba08df (diff) | |
| parent | 32418f0ff3e7f25ca67334585d6d8442b34cb4af (diff) | |
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/applications/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/settings/applications/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/settings/login_activities/index.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/settings/applications/index.html.haml b/app/views/settings/applications/index.html.haml index a1f904a3a..5c31d56bc 100644 --- a/app/views/settings/applications/index.html.haml +++ b/app/views/settings/applications/index.html.haml @@ -5,7 +5,7 @@ = link_to t('doorkeeper.applications.index.new'), new_settings_application_path, class: 'button' - if @applications.empty? - %div.muted-hint.center-text=t 'doorkeeper.applications.index.empty' + .muted-hint.center-text= t 'doorkeeper.applications.index.empty' - else .table-wrapper %table.table diff --git a/app/views/settings/applications/show.html.haml b/app/views/settings/applications/show.html.haml index 390682d6f..466a8ba34 100644 --- a/app/views/settings/applications/show.html.haml +++ b/app/views/settings/applications/show.html.haml @@ -6,7 +6,7 @@ .table-wrapper %table.table %tbody - %tr + %tr %th= t('doorkeeper.applications.show.application_id') %td %code= @application.uid @@ -15,7 +15,7 @@ %td %code= @application.secret %tr - %th{ rowspan: 2}= t('applications.your_token') + %th{ rowspan: 2 }= t('applications.your_token') %td %code= current_user.token_for_app(@application).token %tr diff --git a/app/views/settings/login_activities/index.html.haml b/app/views/settings/login_activities/index.html.haml index ce524fbef..6fb1bc34c 100644 --- a/app/views/settings/login_activities/index.html.haml +++ b/app/views/settings/login_activities/index.html.haml @@ -6,7 +6,7 @@ %hr.spacer/ - if @login_activities.empty? - %div.muted-hint.center-text + .muted-hint.center-text = t 'login_activities.empty' - else .announcements-list |