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
b48a23cd
Commit
b48a23cd
authored
Jan 29, 2019
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace deprecated render text
parent
c441a155
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
ee/app/controllers/oauth/jira/authorizations_controller.rb
ee/app/controllers/oauth/jira/authorizations_controller.rb
+1
-1
ee/changelogs/unreleased/deprecated-render-text.yml
ee/changelogs/unreleased/deprecated-render-text.yml
+5
-0
No files found.
ee/app/controllers/oauth/jira/authorizations_controller.rb
View file @
b48a23cd
...
...
@@ -36,6 +36,6 @@ class Oauth::Jira::AuthorizationsController < ApplicationController
auth_response
=
Gitlab
::
HTTP
.
post
(
oauth_token_url
,
body:
auth_params
,
allow_local_requests:
true
)
token_type
,
scope
,
token
=
auth_response
[
'token_type'
],
auth_response
[
'scope'
],
auth_response
[
'access_token'
]
render
text
:
"access_token=
#{
token
}
&scope=
#{
scope
}
&token_type=
#{
token_type
}
"
render
plain
:
"access_token=
#{
token
}
&scope=
#{
scope
}
&token_type=
#{
token_type
}
"
end
end
ee/changelogs/unreleased/deprecated-render-text.yml
0 → 100644
View file @
b48a23cd
---
title
:
Replace deprecated render text
merge_request
:
9346
author
:
Jasper Maes
type
:
other
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