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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
3cc7f46a
Commit
3cc7f46a
authored
Aug 08, 2017
by
Jose Ivan Vargas
Committed by
Rémy Coutable
Aug 10, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix linters
parent
2feec65a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
17 deletions
+0
-17
app/assets/javascripts/project_select.js
app/assets/javascripts/project_select.js
+0
-2
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
...e_merge_request_widget/components/states/mr_widget_wip.js
+0
-3
app/controllers/omniauth_callbacks_controller.rb
app/controllers/omniauth_callbacks_controller.rb
+0
-12
No files found.
app/assets/javascripts/project_select.js
View file @
3cc7f46a
...
@@ -51,14 +51,12 @@ import ProjectSelectComboButton from './project_select_combo_button';
...
@@ -51,14 +51,12 @@ import ProjectSelectComboButton from './project_select_combo_button';
});
});
$
(
'
.ajax-project-select
'
).
each
(
function
(
i
,
select
)
{
$
(
'
.ajax-project-select
'
).
each
(
function
(
i
,
select
)
{
var
placeholder
;
var
placeholder
;
var
idAttribute
;
this
.
groupId
=
$
(
select
).
data
(
'
group-id
'
);
this
.
groupId
=
$
(
select
).
data
(
'
group-id
'
);
this
.
includeGroups
=
$
(
select
).
data
(
'
include-groups
'
);
this
.
includeGroups
=
$
(
select
).
data
(
'
include-groups
'
);
this
.
allProjects
=
$
(
select
).
data
(
'
allprojects
'
)
||
false
;
this
.
allProjects
=
$
(
select
).
data
(
'
allprojects
'
)
||
false
;
this
.
orderBy
=
$
(
select
).
data
(
'
order-by
'
)
||
'
id
'
;
this
.
orderBy
=
$
(
select
).
data
(
'
order-by
'
)
||
'
id
'
;
this
.
withIssuesEnabled
=
$
(
select
).
data
(
'
with-issues-enabled
'
);
this
.
withIssuesEnabled
=
$
(
select
).
data
(
'
with-issues-enabled
'
);
this
.
withMergeRequestsEnabled
=
$
(
select
).
data
(
'
with-merge-requests-enabled
'
);
this
.
withMergeRequestsEnabled
=
$
(
select
).
data
(
'
with-merge-requests-enabled
'
);
idAttribute
=
$
(
select
).
data
(
'
idattribute
'
)
||
'
web_url
'
;
placeholder
=
"
Search for project
"
;
placeholder
=
"
Search for project
"
;
if
(
this
.
includeGroups
)
{
if
(
this
.
includeGroups
)
{
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
View file @
3cc7f46a
...
@@ -33,9 +33,6 @@ export default {
...
@@ -33,9 +33,6 @@ export default {
});
});
},
},
},
},
components
:
{
statusIcon
,
},
template
:
`
template
:
`
<div class="mr-widget-body media">
<div class="mr-widget-body media">
<status-icon status="failed" :showDisabledButton="Boolean(mr.removeWIPPath)" />
<status-icon status="failed" :showDisabledButton="Boolean(mr.removeWIPPath)" />
...
...
app/controllers/omniauth_callbacks_controller.rb
View file @
3cc7f46a
...
@@ -169,18 +169,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
...
@@ -169,18 +169,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
redirect_to
new_user_session_path
redirect_to
new_user_session_path
end
end
def
fail_login
error_message
=
@user
.
errors
.
full_messages
.
to_sentence
return
redirect_to
omniauth_error_path
(
oauth
[
'provider'
],
error:
error_message
)
end
def
fail_ldap_login
flash
[
:alert
]
=
'Access denied for your LDAP account.'
redirect_to
new_user_session_path
end
def
log_audit_event
(
user
,
options
=
{})
def
log_audit_event
(
user
,
options
=
{})
AuditEventService
.
new
(
user
,
user
,
options
)
AuditEventService
.
new
(
user
,
user
,
options
)
.
for_authentication
.
security_event
.
for_authentication
.
security_event
...
...
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