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
958ee053
Commit
958ee053
authored
Sep 05, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Inherit from ApplicationController
parent
748c9354
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
app/controllers/oauth/jira/authorizations_controller.rb
app/controllers/oauth/jira/authorizations_controller.rb
+4
-1
lib/api/github/entities.rb
lib/api/github/entities.rb
+6
-0
No files found.
app/controllers/oauth/jira/authorizations_controller.rb
View file @
958ee053
...
...
@@ -2,7 +2,10 @@
# flow routes for Jira DVCS integration.
# See https://gitlab.com/gitlab-org/gitlab-ee/issues/2381
#
class
Oauth::Jira::AuthorizationsController
<
ActionController
::
Base
class
Oauth::Jira::AuthorizationsController
<
ApplicationController
skip_before_action
:authenticate_user!
skip_before_action
:verify_authenticity_token
# 1. Rewire Jira OAuth initial request to our stablished OAuth authorization URL.
def
new
session
[
:redirect_uri
]
=
params
[
'redirect_uri'
]
...
...
lib/api/github/entities.rb
View file @
958ee053
...
...
@@ -29,6 +29,12 @@ module API
email:
commit
.
author_email
}
end
expose
:committer
do
|
commit
|
{
login:
commit
.
author
&
.
username
,
email:
commit
.
committer_email
}
end
expose
:commit
do
|
commit
|
{
author:
{
...
...
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