Skip to content

Commit

Permalink
Merge pull request doorkeeper-gem#350 from jasl/bootstrap3
Browse files Browse the repository at this point in the history
fix doorkeeper-gem#343 nit-picky comments
  • Loading branch information
tute committed Jan 30, 2014
2 parents b9d57a6 + 95690a7 commit c39f02f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
7 changes: 5 additions & 2 deletions app/views/doorkeeper/applications/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
<h4>Callback urls:</h4>

<p id="callback_url">
<% @application.redirect_uri.split.each do |uri| %><code><%= uri %></code>
<% @application.redirect_uri.split.each do |uri| %>
<code><%= uri %></code>
<% end %>
</p>

Expand All @@ -23,7 +24,9 @@

<h4>Link to authorization code:</h4>

<p><%= link_to 'Authorize', oauth_authorization_path(:client_id => @application.uid, :redirect_uri => @application.redirect_uri, :response_type => 'code'), class: 'btn btn-success', target: '_blank' %></p>
<p>
<%= link_to 'Authorize', oauth_authorization_path(:client_id => @application.uid, :redirect_uri => @application.redirect_uri, :response_type => 'code'), class: 'btn btn-success', target: '_blank' %>
</p>
</div>

<div class="col-md-2">
Expand Down
1 change: 0 additions & 1 deletion lib/doorkeeper/models/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ class Application

validates :name, :secret, :uid, :presence => true
validates :uid, :uniqueness => true
# redirect_uri also check blank, give `presence: true` will duplicate `Can't be blank` message.
validates :redirect_uri, :redirect_uri => true


Expand Down

0 comments on commit c39f02f

Please sign in to comment.