BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
70add138
Commit
70add138
authored
May 11, 2016
by
Timothy Andrew
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor fixes after a final look at the diff.
- Spaces around `{` and `}` in HAML. - Typo in CHANGELOG. - Remove i18n.
parent
d915e7d5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
10 deletions
+6
-10
CHANGELOG
CHANGELOG
+1
-1
index.html.haml
app/views/profiles/personal_access_tokens/index.html.haml
+5
-5
en.yml
config/locales/en.yml
+0
-4
No files found.
CHANGELOG
View file @
70add138
...
@@ -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 acces
s
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
...
...
app/views/profiles/personal_access_tokens/index.html.haml
View file @
70add138
...
@@ -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
...
...
config/locales/en.yml
View file @
70add138
...
@@ -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."
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment