BigW Consortium Gitlab

Commit 70add138 by Timothy Andrew

Minor fixes after a final look at the diff.

- Spaces around `{` and `}` in HAML. - Typo in CHANGELOG. - Remove i18n.
parent d915e7d5
...@@ -12,7 +12,7 @@ v 8.8.0 (unreleased) ...@@ -12,7 +12,7 @@ v 8.8.0 (unreleased)
- GitAccess#protected_tag? no longer loads all tags just to check if a single one exists - GitAccess#protected_tag? no longer loads all tags just to check if a single one exists
- Reduce delay in destroying a project from 1-minute to immediately - Reduce delay in destroying a project from 1-minute to immediately
- Make build status canceled if any of the jobs was canceled and none failed - Make build status canceled if any of the jobs was canceled and none failed
- Allow authentication using personal acces tokens - Allow authentication using personal access tokens
- Upgrade Sidekiq to 4.1.2 - Upgrade Sidekiq to 4.1.2
- Sanitize repo paths in new project error message - Sanitize repo paths in new project error message
- Bump mail_room to 0.7.0 to fix stuck IDLE connections - Bump mail_room to 0.7.0 to fix stuck IDLE connections
......
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
%tr %tr
%td= token.name %td= token.name
%td.input-group.personal-access-tokens-token-column %td.input-group.personal-access-tokens-token-column
%input.form-control{type: "text", value: token.token, readonly: true} %input.form-control{ type: "text", value: token.token, readonly: true }
%div.input-group-btn %div.input-group-btn
%button.btn.btn-default{type: "button", data: {clipboard_text: token.token}} %button.btn.btn-default{ type: "button", data: { clipboard_text: token.token } }
%i.fa.fa-clipboard %i.fa.fa-clipboard
%td= token.created_at.to_date %td= token.created_at.to_date
- if token.expires_at.present? - if token.expires_at.present?
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
- else - else
%td %td
%span.personal-access-tokens-never-expires-label Never %span.personal-access-tokens-never-expires-label Never
%td= link_to "Revoke", revoke_profile_personal_access_token_path(token), method: :put, class: "btn btn-danger", data: {confirm: t('profile.personal_access_tokens.revoke.confirmation')} %td= link_to "Revoke", revoke_profile_personal_access_token_path(token), method: :put, class: "btn btn-danger", data: { confirm: "Are you sure? This cannot be undone." }
- else - else
%span You don't have any active tokens yet. %span You don't have any active tokens yet.
...@@ -78,9 +78,9 @@ ...@@ -78,9 +78,9 @@
%tr %tr
%td= token.name %td= token.name
%td.input-group.personal-access-tokens-token-column %td.input-group.personal-access-tokens-token-column
%input.form-control{type: "text", value: token.token, readonly: true} %input.form-control{ type: "text", value: token.token, readonly: true }
%div.input-group-btn %div.input-group-btn
%button.btn.btn-default{type: "button", data: {clipboard_text: token.token}} %button.btn.btn-default{ type: "button", data: { clipboard_text: token.token } }
%i.fa.fa-clipboard %i.fa.fa-clipboard
%td= token.created_at.to_date %td= token.created_at.to_date
......
...@@ -12,7 +12,3 @@ en: ...@@ -12,7 +12,3 @@ en:
pagination: pagination:
previous: "Prev" previous: "Prev"
next: "Next" next: "Next"
profile:
personal_access_tokens:
revoke:
confirmation: "Are you sure? This cannot be undone."
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment