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
2ac27a96
Commit
2ac27a96
authored
May 12, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'import-export-users_select' into 'master'
Import export users select See merge request !11286
parents
8c4e4020
05278b2f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
19 additions
and
9 deletions
+19
-9
dispatcher.js
app/assets/javascripts/dispatcher.js
+14
-1
issuable_context.js
app/assets/javascripts/issuable_context.js
+1
-1
issuable_form.js
app/assets/javascripts/issuable_form.js
+2
-1
todos.js
app/assets/javascripts/todos.js
+2
-1
users_select.js
app/assets/javascripts/users_select.js
+0
-0
new_user_map.html.haml
app/views/import/fogbugz/new_user_map.html.haml
+0
-3
_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+0
-1
_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+0
-1
No files found.
app/assets/javascripts/dispatcher.js
View file @
2ac27a96
...
...
@@ -14,7 +14,6 @@
/* global NotificationsForm */
/* global TreeView */
/* global NotificationsDropdown */
/* global UsersSelect */
/* global GroupAvatar */
/* global LineHighlighter */
/* global ProjectFork */
...
...
@@ -52,6 +51,7 @@ import ShortcutsWiki from './shortcuts_wiki';
import
Pipelines
from
'./pipelines'
;
import
BlobViewer
from
'./blob/viewer/index'
;
import
AutoWidthDropdownSelect
from
'./issuable/auto_width_dropdown_select'
;
import
UsersSelect
from
'./users_select'
;
const
ShortcutsBlob
=
require
(
'./shortcuts_blob'
);
...
...
@@ -113,6 +113,7 @@ const ShortcutsBlob = require('./shortcuts_blob');
case
'projects:boards:show'
:
case
'projects:boards:index'
:
shortcut_handler
=
new
ShortcutsNavigation
();
new
UsersSelect
();
break
;
case
'projects:builds:show'
:
new
Build
();
...
...
@@ -127,6 +128,7 @@ const ShortcutsBlob = require('./shortcuts_blob');
prefixId
:
page
===
'projects:merge_requests:index'
?
'merge_request_'
:
'issue_'
,
});
shortcut_handler
=
new
ShortcutsNavigation
();
new
UsersSelect
();
break
;
case
'projects:issues:show'
:
new
Issue
();
...
...
@@ -139,6 +141,10 @@ const ShortcutsBlob = require('./shortcuts_blob');
new
Milestone
();
new
Sidebar
();
break
;
case
'groups:issues'
:
case
'groups:merge_requests'
:
new
UsersSelect
();
break
;
case
'dashboard:todos:index'
:
new
gl
.
Todos
();
break
;
...
...
@@ -223,6 +229,10 @@ const ShortcutsBlob = require('./shortcuts_blob');
case
'dashboard:activity'
:
new
gl
.
Activities
();
break
;
case
'dashboard:issues'
:
case
'dashboard:merge_requests'
:
new
UsersSelect
();
break
;
case
'projects:commit:show'
:
new
Commit
();
new
gl
.
Diff
();
...
...
@@ -377,6 +387,9 @@ const ShortcutsBlob = require('./shortcuts_blob');
new
LineHighlighter
();
new
BlobViewer
();
break
;
case
'import:fogbugz:new_user_map'
:
new
UsersSelect
();
break
;
}
switch
(
path
.
first
())
{
case
'sessions'
:
...
...
app/assets/javascripts/issuable_context.js
View file @
2ac27a96
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-new, comma-dangle, quotes, prefer-arrow-callback, consistent-return, one-var, no-var, one-var-declaration-per-line, no-underscore-dangle, max-len */
/* global UsersSelect */
/* global bp */
import
Cookies
from
'js-cookie'
;
import
UsersSelect
from
'./users_select'
;
(
function
()
{
this
.
IssuableContext
=
(
function
()
{
...
...
app/assets/javascripts/issuable_form.js
View file @
2ac27a96
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-use-before-define, no-useless-escape, no-new, quotes, object-shorthand, no-unused-vars, comma-dangle, no-alert, consistent-return, no-else-return, prefer-template, one-var, one-var-declaration-per-line, curly, max-len */
/* global GitLab */
/* global UsersSelect */
/* global ZenMode */
/* global Autosave */
/* global dateFormat */
/* global Pikaday */
import
UsersSelect
from
'./users_select'
;
(
function
()
{
this
.
IssuableForm
=
(
function
()
{
IssuableForm
.
prototype
.
issueMoveConfirmMsg
=
'Are you sure you want to move this issue to another project?'
;
...
...
app/assets/javascripts/todos.js
View file @
2ac27a96
/* eslint-disable class-methods-use-this, no-unneeded-ternary, quote-props */
/* global UsersSelect */
import
UsersSelect
from
'./users_select'
;
class
Todos
{
constructor
()
{
...
...
app/assets/javascripts/users_select.js
View file @
2ac27a96
This diff is collapsed.
Click to expand it.
app/views/import/fogbugz/new_user_map.html.haml
View file @
2ac27a96
...
...
@@ -46,6 +46,3 @@
.form-actions
=
submit_tag
'Continue to the next step'
,
class:
'btn btn-create'
:javascript
new
UsersSelect
();
app/views/shared/issuable/_filter.html.haml
View file @
2ac27a96
...
...
@@ -71,7 +71,6 @@
=
render
'shared/labels_row'
,
labels:
@labels
:javascript
new
UsersSelect
();
new
LabelsSelect
();
new
MilestoneSelect
();
new
IssueStatusSelect
();
...
...
app/views/shared/issuable/_search_bar.html.haml
View file @
2ac27a96
...
...
@@ -150,7 +150,6 @@
-
unless
type
===
:boards_modal
:javascript
new
UsersSelect
();
new
LabelsSelect
();
new
MilestoneSelect
();
new
IssueStatusSelect
();
...
...
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