Download as
Browse Code »

Commit 55a167ed98df0473a8916599435ecc966de940b6

Authored by Leandro Santos
2 parents b1a2a1ae 9ca1e552
Exists in staging and in 7 other branches angular_poc, api-article-archived, api-homepage, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email

Merge branch 'master' into stable

Showing 4 changed files with 3 additions and 4 deletions   Show diff stats
Gemfile
  Diff comments   View file @55a167e
... ... @@ -19,7 +19,7 @@ gem 'exception_notification', '~> 4.0.1'
19 19 gem 'gettext', '~> 2.2.1', :require => false, :group => :development
20 20 gem 'locale', '~> 2.0.5'
21 21 gem 'whenever', :require => false
22   -gem 'eita-jrails', :require => false
  22 +gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
23 23  
24 24 group :production do
25 25 gem 'dalli', '~> 2.7.0'
... ...
app/controllers/public_controller.rb
  Diff comments   View file @55a167e
... ... @@ -13,7 +13,7 @@ class PublicController < ApplicationController
13 13  
14 14 def private_profile
15 15 private_profile_partial_parameters
16   - render :template => 'shared/access_denied.html.erb', :status => 403
  16 + render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
17 17 end
18 18  
19 19 def invisible_profile
... ...
config/initializers/jrails.rb
View file @b1a2a1a
... ... @@ -1 +0,0 @@
1   -require 'jrails'
debian/control
  Diff comments   View file @55a167e
... ... @@ -42,7 +42,7 @@ Depends: adduser,
42 42 ruby-acts-as-taggable-on,
43 43 ruby-daemons,
44 44 ruby-dalli,
45   - ruby-eita-jrails (>= 0.9.3-3~),
  45 + ruby-eita-jrails (>= 0.9.3-5~),
46 46 ruby-eventmachine (>= 0.12.10-4~),
47 47 ruby-exception-notification,
48 48 ruby-fast-gettext,
... ...