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
Jérome Perrin
gitlab-ce
Commits
1fbc4886
Commit
1fbc4886
authored
Mar 02, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrected JS for new master js build updates [ci skip]
parent
ddfd09c0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
9 deletions
+10
-9
app/assets/javascripts/application.js
app/assets/javascripts/application.js
+1
-0
app/assets/javascripts/behaviors/bind_in_out.js.es6
app/assets/javascripts/behaviors/bind_in_out.js.es6
+1
-5
app/assets/javascripts/dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+5
-1
app/views/shared/_group_form.html.haml
app/views/shared/_group_form.html.haml
+1
-1
spec/javascripts/behaviors/bind_in_out_spec.js.es6
spec/javascripts/behaviors/bind_in_out_spec.js.es6
+2
-2
No files found.
app/assets/javascripts/application.js
View file @
1fbc4886
...
@@ -47,6 +47,7 @@ require('./behaviors/details_behavior');
...
@@ -47,6 +47,7 @@ require('./behaviors/details_behavior');
require
(
'
./behaviors/quick_submit
'
);
require
(
'
./behaviors/quick_submit
'
);
require
(
'
./behaviors/requires_input
'
);
require
(
'
./behaviors/requires_input
'
);
require
(
'
./behaviors/toggler_behavior
'
);
require
(
'
./behaviors/toggler_behavior
'
);
require
(
'
./behaviors/bind_in_out
'
);
// blob
// blob
require
(
'
./blob/blob_ci_yaml
'
);
require
(
'
./blob/blob_ci_yaml
'
);
...
...
app/assets/javascripts/behaviors/bind_in_out.js.es6
View file @
1fbc4886
...
@@ -41,8 +41,4 @@ class BindInOut {
...
@@ -41,8 +41,4 @@ class BindInOut {
}
}
}
}
const global = window.gl || (window.gl = {});
export default BindInOut;
global.BindInOut = BindInOut;
module.exports = BindInOut;
app/assets/javascripts/dispatcher.js.es6
View file @
1fbc4886
...
@@ -35,6 +35,8 @@
...
@@ -35,6 +35,8 @@
/* global Labels */
/* global Labels */
/* global Shortcuts */
/* global Shortcuts */
import BindInOut from './behaviors/bind_in_out.js.es6';
const ShortcutsBlob = require('./shortcuts_blob');
const ShortcutsBlob = require('./shortcuts_blob');
const UserCallout = require('./user_callout');
const UserCallout = require('./user_callout');
...
@@ -217,7 +219,9 @@ const UserCallout = require('./user_callout');
...
@@ -217,7 +219,9 @@ const UserCallout = require('./user_callout');
break;
break;
case 'groups:new':
case 'groups:new':
case 'admin:groups:new':
case 'admin:groups:new':
gl.BindInOut.initAll();
case 'groups:create':
case 'admin:groups:create':
BindInOut.initAll();
case 'groups:new':
case 'groups:new':
case 'admin:groups:new':
case 'admin:groups:new':
case 'groups:edit':
case 'groups:edit':
...
...
app/views/shared/_group_form.html.haml
View file @
1fbc4886
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
%strong
=
parent
.
full_path
+
'/'
%strong
=
parent
.
full_path
+
'/'
=
f
.
text_field
:path
,
placeholder:
'open-source'
,
class:
'form-control'
,
=
f
.
text_field
:path
,
placeholder:
'open-source'
,
class:
'form-control'
,
autofocus:
local_assigns
[
:autofocus
]
||
false
,
required:
true
,
autofocus:
local_assigns
[
:autofocus
]
||
false
,
required:
true
,
pattern:
Gitlab
::
Regex
::
NAMESPACE_REGEX_STR_
SIMPLE
,
pattern:
Gitlab
::
Regex
::
NAMESPACE_REGEX_STR_
JS
,
title:
'Please choose a group name with no special characters.'
,
title:
'Please choose a group name with no special characters.'
,
"data-bind-in"
=>
"
#{
'create_chat_team'
if
Gitlab
.
config
.
mattermost
.
enabled
}
"
"data-bind-in"
=>
"
#{
'create_chat_team'
if
Gitlab
.
config
.
mattermost
.
enabled
}
"
-
if
parent
-
if
parent
...
...
spec/javascripts/behaviors/bind_in_out_spec.js.es6
View file @
1fbc4886
const BindInOut = require('~/behaviors/bind_in_out')
;
import BindInOut from '~/behaviors/bind_in_out.js.es6'
;
const ClassSpecHelper = require('../helpers/class_spec_helper')
;
import ClassSpecHelper from '../helpers/class_spec_helper.js.es6'
;
describe('BindInOut', function () {
describe('BindInOut', function () {
describe('.constructor', function () {
describe('.constructor', function () {
...
...
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