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
ab0d41e2
Commit
ab0d41e2
authored
Feb 01, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-internationalization-namespace' into 'master'
Remove namespaced internationalization import See merge request gitlab-org/gitlab-ce!16838
parents
dbcd43db
10a2d95a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
awards_handler.js
app/assets/javascripts/awards_handler.js
+2
-2
No files found.
app/assets/javascripts/awards_handler.js
View file @
ab0d41e2
/* eslint-disable class-methods-use-this */
import
_
from
'underscore'
;
import
Cookies
from
'js-cookie'
;
import
{
s
__
}
from
'./locale'
;
import
{
__
}
from
'./locale'
;
import
{
isInIssuePage
,
updateTooltipTitle
}
from
'./lib/utils/common_utils'
;
import
flash
from
'./flash'
;
import
axios
from
'./lib/utils/axios_utils'
;
...
...
@@ -451,7 +451,7 @@ class AwardsHandler {
callback
();
}
})
.
catch
(()
=>
flash
(
s
__
(
'Something went wrong on our end.'
)));
.
catch
(()
=>
flash
(
__
(
'Something went wrong on our end.'
)));
}
}
...
...
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