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
9a3b09ad
Commit
9a3b09ad
authored
5 years ago
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in config/routes/import.rb
parent
de3bfd28
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
config/routes/import.rb
config/routes/import.rb
+0
-4
No files found.
config/routes/import.rb
View file @
9a3b09ad
# Alias import callbacks under the /users/auth endpoint so that
# the OAuth2 callback URL can be restricted under http://example.com/users/auth
# instead of http://example.com.
<<<<<<<
HEAD
Devise
.
omniauth_providers
.
map
(
&
:downcase
).
each
do
|
provider
|
=======
Devise
.
omniauth_providers
.
each
do
|
provider
|
>>>>>>>
dev
/
master
next
if
provider
==
'ldapmain'
get
"/users/auth/-/import/
#{
provider
}
/callback"
,
to:
"import/
#{
provider
}
#callback"
,
as:
"users_import_
#{
provider
}
_callback"
...
...
This diff is collapsed.
Click to expand it.
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