Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c98212e6
Commit
c98212e6
authored
May 28, 2018
by
Lukas Eipert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix `spaced-comment`
parent
9a9f758d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
13 deletions
+15
-13
app/assets/javascripts/job.js
app/assets/javascripts/job.js
+1
-1
app/assets/javascripts/locale/index.js
app/assets/javascripts/locale/index.js
+3
-3
app/assets/javascripts/locale/sprintf.js
app/assets/javascripts/locale/sprintf.js
+1
-1
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+1
-1
app/assets/javascripts/pages/sessions/new/oauth_remember_me.js
...ssets/javascripts/pages/sessions/new/oauth_remember_me.js
+1
-1
app/assets/javascripts/registry/stores/actions.js
app/assets/javascripts/registry/stores/actions.js
+4
-2
app/assets/javascripts/vue_shared/translate.js
app/assets/javascripts/vue_shared/translate.js
+3
-3
spec/javascripts/u2f/mock_u2f_device.js
spec/javascripts/u2f/mock_u2f_device.js
+1
-1
No files found.
app/assets/javascripts/job.js
View file @
c98212e6
...
@@ -84,7 +84,7 @@ export default class Job {
...
@@ -84,7 +84,7 @@ export default class Job {
If the browser does not support position sticky, it returns the position as static.
If the browser does not support position sticky, it returns the position as static.
If the browser does support sticky, then we allow the browser to handle it, if not
If the browser does support sticky, then we allow the browser to handle it, if not
then we use a polyfill
then we use a polyfill
*
*
/
*/
if
(
this
.
$topBar
.
css
(
'
position
'
)
!==
'
static
'
)
return
;
if
(
this
.
$topBar
.
css
(
'
position
'
)
!==
'
static
'
)
return
;
StickyFill
.
add
(
this
.
$topBar
);
StickyFill
.
add
(
this
.
$topBar
);
...
...
app/assets/javascripts/locale/index.js
View file @
c98212e6
...
@@ -9,7 +9,7 @@ delete window.translations;
...
@@ -9,7 +9,7 @@ delete window.translations;
Translates `text`
Translates `text`
@param text The text to be translated
@param text The text to be translated
@returns {String} The translated text
@returns {String} The translated text
*
*
/
*/
const
gettext
=
locale
.
gettext
.
bind
(
locale
);
const
gettext
=
locale
.
gettext
.
bind
(
locale
);
/**
/**
...
@@ -21,7 +21,7 @@ const gettext = locale.gettext.bind(locale);
...
@@ -21,7 +21,7 @@ const gettext = locale.gettext.bind(locale);
@param pluralText Plural text to translate (eg. '%d days')
@param pluralText Plural text to translate (eg. '%d days')
@param count Number to decide which translation to use (eg. 2)
@param count Number to decide which translation to use (eg. 2)
@returns {String} Translated text with the number replaced (eg. '2 days')
@returns {String} Translated text with the number replaced (eg. '2 days')
*
*
/
*/
const
ngettext
=
(
text
,
pluralText
,
count
)
=>
{
const
ngettext
=
(
text
,
pluralText
,
count
)
=>
{
const
translated
=
locale
.
ngettext
(
text
,
pluralText
,
count
).
replace
(
/%d/g
,
count
).
split
(
'
|
'
);
const
translated
=
locale
.
ngettext
(
text
,
pluralText
,
count
).
replace
(
/%d/g
,
count
).
split
(
'
|
'
);
...
@@ -38,7 +38,7 @@ const ngettext = (text, pluralText, count) => {
...
@@ -38,7 +38,7 @@ const ngettext = (text, pluralText, count) => {
(eg. 'Context')
(eg. 'Context')
@param key Is the dynamic variable you want to be translated
@param key Is the dynamic variable you want to be translated
@returns {String} Translated context based text
@returns {String} Translated context based text
*
*
/
*/
const
pgettext
=
(
keyOrContext
,
key
)
=>
{
const
pgettext
=
(
keyOrContext
,
key
)
=>
{
const
normalizedKey
=
key
?
`
${
keyOrContext
}
|
${
key
}
`
:
keyOrContext
;
const
normalizedKey
=
key
?
`
${
keyOrContext
}
|
${
key
}
`
:
keyOrContext
;
const
translated
=
gettext
(
normalizedKey
).
split
(
'
|
'
);
const
translated
=
gettext
(
normalizedKey
).
split
(
'
|
'
);
...
...
app/assets/javascripts/locale/sprintf.js
View file @
c98212e6
...
@@ -10,7 +10,7 @@ import _ from 'underscore';
...
@@ -10,7 +10,7 @@ import _ from 'underscore';
@see https://ruby-doc.org/core-2.3.3/Kernel.html#method-i-sprintf
@see https://ruby-doc.org/core-2.3.3/Kernel.html#method-i-sprintf
@see https://gitlab.com/gitlab-org/gitlab-ce/issues/37992
@see https://gitlab.com/gitlab-org/gitlab-ce/issues/37992
*
*
/
*/
export
default
(
input
,
parameters
,
escapeParameters
=
true
)
=>
{
export
default
(
input
,
parameters
,
escapeParameters
=
true
)
=>
{
let
output
=
input
;
let
output
=
input
;
...
...
app/assets/javascripts/merge_request_tabs.js
View file @
c98212e6
...
@@ -427,7 +427,7 @@ export default class MergeRequestTabs {
...
@@ -427,7 +427,7 @@ export default class MergeRequestTabs {
If the browser does not support position sticky, it returns the position as static.
If the browser does not support position sticky, it returns the position as static.
If the browser does support sticky, then we allow the browser to handle it, if not
If the browser does support sticky, then we allow the browser to handle it, if not
then we default back to Bootstraps affix
then we default back to Bootstraps affix
*
*
/
*/
if
(
$tabs
.
css
(
'
position
'
)
!==
'
static
'
)
return
;
if
(
$tabs
.
css
(
'
position
'
)
!==
'
static
'
)
return
;
const
$diffTabs
=
$
(
'
#diff-notes-app
'
);
const
$diffTabs
=
$
(
'
#diff-notes-app
'
);
...
...
app/assets/javascripts/pages/sessions/new/oauth_remember_me.js
View file @
c98212e6
...
@@ -5,7 +5,7 @@ import $ from 'jquery';
...
@@ -5,7 +5,7 @@ import $ from 'jquery';
*
*
* Toggling this checkbox adds/removes a `remember_me` parameter to the
* Toggling this checkbox adds/removes a `remember_me` parameter to the
* login buttons' href, which is passed on to the omniauth callback.
* login buttons' href, which is passed on to the omniauth callback.
*
*
/
*/
export
default
class
OAuthRememberMe
{
export
default
class
OAuthRememberMe
{
constructor
(
opts
=
{})
{
constructor
(
opts
=
{})
{
...
...
app/assets/javascripts/registry/stores/actions.js
View file @
c98212e6
...
@@ -29,9 +29,11 @@ export const fetchList = ({ commit }, { repo, page }) => {
...
@@ -29,9 +29,11 @@ export const fetchList = ({ commit }, { repo, page }) => {
});
});
};
};
export
const
deleteRepo
=
({
commit
},
repo
)
=>
Vue
.
http
.
delete
(
repo
.
destroyPath
);
// eslint-disable-line no-unused-vars
// eslint-disable-next-line no-unused-vars
export
const
deleteRepo
=
({
commit
},
repo
)
=>
Vue
.
http
.
delete
(
repo
.
destroyPath
);
export
const
deleteRegistry
=
({
commit
},
image
)
=>
Vue
.
http
.
delete
(
image
.
destroyPath
);
// eslint-disable-line no-unused-vars
// eslint-disable-next-line no-unused-vars
export
const
deleteRegistry
=
({
commit
},
image
)
=>
Vue
.
http
.
delete
(
image
.
destroyPath
);
export
const
setMainEndpoint
=
({
commit
},
data
)
=>
commit
(
types
.
SET_MAIN_ENDPOINT
,
data
);
export
const
setMainEndpoint
=
({
commit
},
data
)
=>
commit
(
types
.
SET_MAIN_ENDPOINT
,
data
);
export
const
toggleLoading
=
({
commit
})
=>
commit
(
types
.
TOGGLE_MAIN_LOADING
);
export
const
toggleLoading
=
({
commit
})
=>
commit
(
types
.
TOGGLE_MAIN_LOADING
);
...
...
app/assets/javascripts/vue_shared/translate.js
View file @
c98212e6
...
@@ -13,7 +13,7 @@ export default (Vue) => {
...
@@ -13,7 +13,7 @@ export default (Vue) => {
@param text The text to be translated
@param text The text to be translated
@returns {String} The translated text
@returns {String} The translated text
*
*
/
*/
__
,
__
,
/**
/**
Translate the text with a number
Translate the text with a number
...
@@ -24,7 +24,7 @@ export default (Vue) => {
...
@@ -24,7 +24,7 @@ export default (Vue) => {
@param pluralText Plural text to translate (eg. '%d days')
@param pluralText Plural text to translate (eg. '%d days')
@param count Number to decide which translation to use (eg. 2)
@param count Number to decide which translation to use (eg. 2)
@returns {String} Translated text with the number replaced (eg. '2 days')
@returns {String} Translated text with the number replaced (eg. '2 days')
*
*
/
*/
n__
,
n__
,
/**
/**
Translate context based text
Translate context based text
...
@@ -36,7 +36,7 @@ export default (Vue) => {
...
@@ -36,7 +36,7 @@ export default (Vue) => {
(eg. 'Context')
(eg. 'Context')
@param key Is the dynamic variable you want to be translated
@param key Is the dynamic variable you want to be translated
@returns {String} Translated context based text
@returns {String} Translated context based text
*
*
/
*/
s__
,
s__
,
sprintf
,
sprintf
,
},
},
...
...
spec/javascripts/u2f/mock_u2f_device.js
View file @
c98212e6
/* eslint-disable prefer-rest-params, wrap-iife,
/* eslint-disable prefer-rest-params, wrap-iife,
no-unused-expressions, no-return-assign, no-param-reassign*/
no-unused-expressions, no-return-assign, no-param-reassign
*/
export
default
class
MockU2FDevice
{
export
default
class
MockU2FDevice
{
constructor
()
{
constructor
()
{
...
...
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