Skip to content
This repository
Browse code

helper ya se ve al crear usuario

  • Loading branch information...
commit 11bfa07a13a7c82386789459f1c19ef1f303f3b5 1 parent 9229237
Antonio Pardo authored June 08, 2012
3  Gemfile
@@ -26,7 +26,8 @@ end
26 26
 
27 27
 group :development do
28 28
   #gem 'pry-rails'
29  
-  gem 'ruby-debug19', :require => 'ruby-debug'
  29
+  # no me arranca el unicorn con ruby-debug19 (apardo)
  30
+  #gem 'ruby-debug19', :require => 'ruby-debug'
30 31
 end
31 32
 
32 33
 gem 'devise'
15  Gemfile.lock
@@ -42,7 +42,6 @@ GEM
42 42
       rails (~> 3.0)
43 43
     addressable (2.2.8)
44 44
     ansi (1.4.2)
45  
-    archive-tar-minitar (0.5.2)
46 45
     arel (3.0.2)
47 46
     bcrypt-ruby (3.0.1)
48 47
     builder (3.0.0)
@@ -74,7 +73,6 @@ GEM
74 73
       coffee-script-source
75 74
       execjs
76 75
     coffee-script-source (1.3.3)
77  
-    columnize (0.3.6)
78 76
     devise (2.1.0)
79 77
       bcrypt-ruby (~> 3.0)
80 78
       orm_adapter (~> 0.0.7)
@@ -106,8 +104,6 @@ GEM
106 104
     libv8 (3.3.10.4)
107 105
     libwebsocket (0.1.3)
108 106
       addressable
109  
-    linecache19 (0.5.12)
110  
-      ruby_core_source (>= 0.1.4)
111 107
     mail (2.4.4)
112 108
       i18n (>= 0.4.0)
113 109
       mime-types (~> 1.16)
@@ -174,16 +170,6 @@ GEM
174 170
     redis-store (1.1.0)
175 171
       redis (~> 2.2.0)
176 172
     rmagick (2.13.1)
177  
-    ruby-debug-base19 (0.11.25)
178  
-      columnize (>= 0.3.1)
179  
-      linecache19 (>= 0.5.11)
180  
-      ruby_core_source (>= 0.1.4)
181  
-    ruby-debug19 (0.11.6)
182  
-      columnize (>= 0.3.1)
183  
-      linecache19 (>= 0.5.11)
184  
-      ruby-debug-base19 (>= 0.11.19)
185  
-    ruby_core_source (0.1.5)
186  
-      archive-tar-minitar (>= 0.5.2)
187 173
     rubyzip (0.9.8)
188 174
     sass (3.1.19)
189 175
     sass-rails (3.2.3)
@@ -257,7 +243,6 @@ DEPENDENCIES
257 243
   redis-rails
258 244
   redis-store
259 245
   rmagick
260  
-  ruby-debug19
261 246
   sass-rails (= 3.2.3)
262 247
   sentry-raven!
263 248
   sitemap_generator
1  app/assets/stylesheets/application.css.sass
@@ -865,3 +865,4 @@ div.jGrowl div.jGrowl-notification, div.jGrowl div.jGrowl-closer
865 865
 
866 866
 #button-home-signup
867 867
   margin-top: -8px
  868
+
2  app/controllers/application_controller.rb
... ...
@@ -1,4 +1,5 @@
1 1
 class ApplicationController < ActionController::Base
  2
+  
2 3
   protect_from_forgery
3 4
 
4 5
   rescue_from CanCan::AccessDenied do |exception|
@@ -11,5 +12,4 @@ class ApplicationController < ActionController::Base
11 12
   def set_http_cache(period, visibility = false)
12 13
     expires_in period, :public => visibility, 'max-stale' => 0
13 14
   end
14  
-
15 15
 end
1  app/helpers/application_helper.rb
... ...
@@ -1,6 +1,7 @@
1 1
 module ApplicationHelper
2 2
 
3 3
   def get_base64logo(campaign = nil)
  4
+
4 5
     # devolvemos un logo en base64 para un suboigame. 
5 6
     # hay que comprobar si la campagin pertenece a un sub
6 7
     logo_oigame = "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"
3  app/mailers/mailman.rb
... ...
@@ -1,6 +1,7 @@
1 1
 # encoding: utf-8
2 2
 class Mailman < ActionMailer::Base
3  
-  
  3
+
  4
+  helper :application
4 5
   layout "email"
5 6
   default from: "oigame@oiga.me"
6 7
 
2  app/views/layouts/application.html.erb
@@ -57,7 +57,7 @@
57 57
         <%= content_tag :p, msg, :class => "#{name}" %>
58 58
       </div>
59 59
     <% end %>
60  
-    <header id="header-wrapper">
  60
+    <header id="header-wrapper" class="">
61 61
       <div class="navbar">
62 62
         <div class="navbar-inner">
63 63
           <div id="container">
1  config/application.rb
@@ -50,6 +50,5 @@ class Application < Rails::Application
50 50
         Devise::Mailer.layout "email" # email.haml or email.erb
51 51
         ActionMailer::Base.helper "application"
52 52
     end
53  
-
54 53
   end
55 54
 end
3  test/unit/campaign_test.rb
... ...
@@ -1,7 +1,4 @@
1 1
 require 'test_helper'
2 2
 
3 3
 class CampaignTest < ActiveSupport::TestCase
4  
-  # test "the truth" do
5  
-  #   assert true
6  
-  # end
7 4
 end

0 notes on commit 11bfa07

Please sign in to comment.
Something went wrong with that request. Please try again.