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
21bb3933
Commit
21bb3933
authored
Jan 11, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dispatcher-sessions' into 'master'
Refactor dispatcher sessions path See merge request gitlab-org/gitlab-ce!16362
parents
bf3c54bf
ea77456d
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
9 deletions
+17
-9
dispatcher.js
app/assets/javascripts/dispatcher.js
+3
-6
index.js
app/assets/javascripts/pages/sessions/new/index.js
+11
-0
oauth_remember_me.js
...ssets/javascripts/pages/sessions/new/oauth_remember_me.js
+0
-0
signin_tabs_memoizer.js
...ts/javascripts/pages/sessions/new/signin_tabs_memoizer.js
+1
-1
username_validator.js
...sets/javascripts/pages/sessions/new/username_validator.js
+0
-0
oauth_remember_me_spec.js
spec/javascripts/oauth_remember_me_spec.js
+1
-1
signin_tabs_memoizer_spec.js
spec/javascripts/signin_tabs_memoizer_spec.js
+1
-1
No files found.
app/assets/javascripts/dispatcher.js
View file @
21bb3933
...
...
@@ -49,17 +49,14 @@ import UsersSelect from './users_select';
import
RefSelectDropdown
from
'./ref_select_dropdown'
;
import
GfmAutoComplete
from
'./gfm_auto_complete'
;
import
ShortcutsBlob
from
'./shortcuts_blob'
;
import
SigninTabsMemoizer
from
'./signin_tabs_memoizer'
;
import
Star
from
'./star'
;
import
TreeView
from
'./tree'
;
import
UsagePing
from
'./usage_ping'
;
import
UsernameValidator
from
'./username_validator'
;
import
VersionCheckImage
from
'./version_check_image'
;
import
Wikis
from
'./wikis'
;
import
ZenMode
from
'./zen_mode'
;
import
initSettingsPanels
from
'./settings_panels'
;
import
initExperimentalFlags
from
'./experimental_flags'
;
import
OAuthRememberMe
from
'./oauth_remember_me'
;
import
PerformanceBar
from
'./performance_bar'
;
import
initBroadcastMessagesForm
from
'./broadcast_message'
;
import
initNotes
from
'./init_notes'
;
...
...
@@ -157,9 +154,9 @@ import Activities from './activities';
initExperimentalFlags
();
break
;
case
'sessions:new'
:
new
UsernameValidator
();
new
SigninTabsMemoizer
();
new
OAuthRememberMe
({
container
:
$
(
".omniauth-container"
)
}).
bindEvents
(
);
import
(
'./pages/sessions/new'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'projects:boards:show'
:
case
'projects:boards:index'
:
...
...
app/assets/javascripts/pages/sessions/new/index.js
0 → 100644
View file @
21bb3933
import
UsernameValidator
from
'./username_validator'
;
import
SigninTabsMemoizer
from
'./signin_tabs_memoizer'
;
import
OAuthRememberMe
from
'./oauth_remember_me'
;
export
default
()
=>
{
new
UsernameValidator
();
// eslint-disable-line no-new
new
SigninTabsMemoizer
();
// eslint-disable-line no-new
new
OAuthRememberMe
({
// eslint-disable-line no-new
container
:
$
(
'.omniauth-container'
),
}).
bindEvents
();
};
app/assets/javascripts/oauth_remember_me.js
→
app/assets/javascripts/
pages/sessions/new/
oauth_remember_me.js
View file @
21bb3933
File moved
app/assets/javascripts/signin_tabs_memoizer.js
→
app/assets/javascripts/
pages/sessions/new/
signin_tabs_memoizer.js
View file @
21bb3933
/* eslint no-param-reassign: ["error", { "props": false }]*/
/* eslint no-new: "off" */
import
AccessorUtilities
from
'
.
/lib/utils/accessor'
;
import
AccessorUtilities
from
'
~
/lib/utils/accessor'
;
/**
* Memorize the last selected tab after reloading a page.
...
...
app/assets/javascripts/username_validator.js
→
app/assets/javascripts/
pages/sessions/new/
username_validator.js
View file @
21bb3933
File moved
spec/javascripts/oauth_remember_me_spec.js
View file @
21bb3933
import
OAuthRememberMe
from
'~/oauth_remember_me'
;
import
OAuthRememberMe
from
'~/
pages/sessions/new/
oauth_remember_me'
;
describe
(
'OAuthRememberMe'
,
()
=>
{
preloadFixtures
(
'static/oauth_remember_me.html.raw'
);
...
...
spec/javascripts/signin_tabs_memoizer_spec.js
View file @
21bb3933
import
AccessorUtilities
from
'~/lib/utils/accessor'
;
import
SigninTabsMemoizer
from
'~/signin_tabs_memoizer'
;
import
SigninTabsMemoizer
from
'~/
pages/sessions/new/
signin_tabs_memoizer'
;
(()
=>
{
describe
(
'SigninTabsMemoizer'
,
()
=>
{
...
...
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