Skip to content

Commit 86b9c5a

Browse files
committed
using rails 4.1
1 parent ed47448 commit 86b9c5a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+125
-115
lines changed

.gitignore

100644100755
File mode changed.

.rspec

100644100755
File mode changed.

Gemfile

100644100755
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
source 'https://rubygems.org'
22

33
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4-
gem 'rails', '4.0.0'
4+
gem 'rails', '4.1'
55

66
# Use mysql as the database for Active Record
77
gem 'mysql2'
88

99
# Use SCSS for stylesheets
10-
gem 'sass-rails', '~> 4.0.0'
10+
gem 'sass-rails', '~> 4.0'
1111

1212
# Use Uglifier as compressor for JavaScript assets
1313
gem 'uglifier', '>= 1.3.0'
1414

1515
# Use CoffeeScript for .js.coffee assets and views
16-
gem 'coffee-rails', '~> 4.0.0'
16+
gem 'coffee-rails', '~> 4.0'
1717

1818
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
1919
# gem 'therubyracer', platforms: :ruby
@@ -53,4 +53,4 @@ gem 'thin'
5353

5454
gem 'rails_admin'
5555
gem 'devise'
56-
gem 'figaro'
56+
gem 'figaro'

Gemfile.lock

100644100755
+116-110
Original file line numberDiff line numberDiff line change
@@ -1,195 +1,201 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.0.0)
5-
actionpack (= 4.0.0)
6-
mail (~> 2.5.3)
7-
actionpack (4.0.0)
8-
activesupport (= 4.0.0)
9-
builder (~> 3.1.0)
10-
erubis (~> 2.7.0)
4+
actionmailer (4.1.0)
5+
actionpack (= 4.1.0)
6+
actionview (= 4.1.0)
7+
mail (~> 2.5.4)
8+
actionpack (4.1.0)
9+
actionview (= 4.1.0)
10+
activesupport (= 4.1.0)
1111
rack (~> 1.5.2)
1212
rack-test (~> 0.6.2)
13-
activemodel (4.0.0)
14-
activesupport (= 4.0.0)
15-
builder (~> 3.1.0)
16-
activerecord (4.0.0)
17-
activemodel (= 4.0.0)
18-
activerecord-deprecated_finders (~> 1.0.2)
19-
activesupport (= 4.0.0)
20-
arel (~> 4.0.0)
21-
activerecord-deprecated_finders (1.0.3)
22-
activesupport (4.0.0)
23-
i18n (~> 0.6, >= 0.6.4)
24-
minitest (~> 4.2)
25-
multi_json (~> 1.3)
13+
actionview (4.1.0)
14+
activesupport (= 4.1.0)
15+
builder (~> 3.1)
16+
erubis (~> 2.7.0)
17+
activemodel (4.1.0)
18+
activesupport (= 4.1.0)
19+
builder (~> 3.1)
20+
activerecord (4.1.0)
21+
activemodel (= 4.1.0)
22+
activesupport (= 4.1.0)
23+
arel (~> 5.0.0)
24+
activesupport (4.1.0)
25+
i18n (~> 0.6, >= 0.6.9)
26+
json (~> 1.7, >= 1.7.7)
27+
minitest (~> 5.1)
2628
thread_safe (~> 0.1)
27-
tzinfo (~> 0.3.37)
28-
addressable (2.3.5)
29-
arel (4.0.0)
30-
atomic (1.1.10)
31-
bcrypt-ruby (3.0.1)
32-
bootstrap-sass (2.3.2.0)
33-
sass (~> 3.2)
34-
builder (3.1.4)
35-
coffee-rails (4.0.0)
29+
tzinfo (~> 1.1)
30+
addressable (2.3.6)
31+
arel (5.0.1.20140414130214)
32+
bcrypt (3.1.7)
33+
builder (3.2.2)
34+
coffee-rails (4.0.1)
3635
coffee-script (>= 2.2.0)
37-
railties (>= 4.0.0.beta, < 5.0)
36+
railties (>= 4.0.0, < 5.0)
3837
coffee-script (2.2.0)
3938
coffee-script-source
4039
execjs
41-
coffee-script-source (1.6.2)
40+
coffee-script-source (1.7.0)
4241
daemons (1.1.9)
43-
devise (1.5.4)
44-
bcrypt-ruby (~> 3.0)
45-
orm_adapter (~> 0.0.3)
46-
warden (~> 1.1)
47-
diff-lcs (1.2.4)
42+
devise (3.2.4)
43+
bcrypt (~> 3.0)
44+
orm_adapter (~> 0.1)
45+
railties (>= 3.2.6, < 5)
46+
thread_safe (~> 0.1)
47+
warden (~> 1.2.3)
48+
diff-lcs (1.2.5)
4849
erubis (2.7.0)
4950
eventmachine (1.0.3)
50-
execjs (1.4.0)
51-
multi_json (~> 1.0)
51+
execjs (2.2.0)
5252
figaro (0.7.0)
5353
bundler (~> 1.0)
5454
rails (>= 3, < 5)
55-
font-awesome-rails (3.2.1.1)
55+
font-awesome-rails (4.1.0.0)
5656
railties (>= 3.2, < 5.0)
57-
haml (4.0.3)
57+
haml (4.0.5)
5858
tilt
5959
hike (1.2.3)
60-
i18n (0.6.4)
61-
jbuilder (1.4.2)
60+
i18n (0.6.9)
61+
jbuilder (1.5.3)
6262
activesupport (>= 3.0.0)
6363
multi_json (>= 1.2.0)
64-
jquery-rails (3.0.1)
64+
jquery-rails (3.1.0)
6565
railties (>= 3.0, < 5.0)
6666
thor (>= 0.14, < 2.0)
67-
jquery-ui-rails (4.0.3)
68-
jquery-rails
69-
railties (>= 3.1.0)
70-
json (1.8.0)
71-
kaminari (0.14.1)
67+
jquery-ui-rails (4.2.1)
68+
railties (>= 3.2.16)
69+
json (1.8.1)
70+
kaminari (0.16.1)
7271
actionpack (>= 3.0.0)
7372
activesupport (>= 3.0.0)
74-
launchy (2.3.0)
73+
launchy (2.4.2)
7574
addressable (~> 2.3)
76-
letter_opener (1.1.2)
75+
letter_opener (1.2.0)
7776
launchy (~> 2.2)
7877
mail (2.5.4)
7978
mime-types (~> 1.16)
8079
treetop (~> 1.4.8)
81-
mime-types (1.23)
82-
mini_portile (0.5.0)
83-
minitest (4.7.5)
84-
multi_json (1.7.7)
85-
mysql2 (0.3.11)
80+
mime-types (1.25.1)
81+
mini_portile (0.6.0)
82+
minitest (5.3.4)
83+
multi_json (1.10.1)
84+
mysql2 (0.3.16)
8685
nested_form (0.3.2)
87-
nokogiri (1.6.0)
88-
mini_portile (~> 0.5.0)
89-
orm_adapter (0.0.7)
90-
polyglot (0.3.3)
86+
nokogiri (1.6.2.1)
87+
mini_portile (= 0.6.0)
88+
orm_adapter (0.5.0)
89+
polyglot (0.3.5)
9190
rack (1.5.2)
9291
rack-pjax (0.7.0)
9392
nokogiri (~> 1.5)
9493
rack (~> 1.3)
9594
rack-test (0.6.2)
9695
rack (>= 1.0)
97-
rails (4.0.0)
98-
actionmailer (= 4.0.0)
99-
actionpack (= 4.0.0)
100-
activerecord (= 4.0.0)
101-
activesupport (= 4.0.0)
96+
rails (4.1.0)
97+
actionmailer (= 4.1.0)
98+
actionpack (= 4.1.0)
99+
actionview (= 4.1.0)
100+
activemodel (= 4.1.0)
101+
activerecord (= 4.1.0)
102+
activesupport (= 4.1.0)
102103
bundler (>= 1.3.0, < 2.0)
103-
railties (= 4.0.0)
104-
sprockets-rails (~> 2.0.0)
105-
rails_admin (0.5.0)
106-
bootstrap-sass (~> 2.3)
104+
railties (= 4.1.0)
105+
sprockets-rails (~> 2.0)
106+
rails_admin (0.6.2)
107107
builder (~> 3.1)
108108
coffee-rails (~> 4.0)
109-
font-awesome-rails (~> 3.0)
109+
font-awesome-rails (>= 3.0)
110110
haml (~> 4.0)
111111
jquery-rails (~> 3.0)
112112
jquery-ui-rails (~> 4.0)
113113
kaminari (~> 0.14)
114114
nested_form (~> 0.3)
115115
rack-pjax (~> 0.7)
116-
rails (~> 4.0.0)
116+
rails (~> 4.0)
117117
remotipart (~> 1.0)
118-
safe_yaml (~> 0.9)
118+
safe_yaml (~> 1.0)
119119
sass-rails (~> 4.0)
120-
railties (4.0.0)
121-
actionpack (= 4.0.0)
122-
activesupport (= 4.0.0)
120+
railties (4.1.0)
121+
actionpack (= 4.1.0)
122+
activesupport (= 4.1.0)
123123
rake (>= 0.8.7)
124124
thor (>= 0.18.1, < 2.0)
125-
rake (10.1.0)
126-
rdoc (3.12.2)
125+
rake (10.3.2)
126+
rdoc (4.1.1)
127127
json (~> 1.4)
128-
remotipart (1.0.5)
129-
rspec-core (2.13.1)
130-
rspec-expectations (2.13.0)
131-
diff-lcs (>= 1.1.3, < 2.0)
132-
rspec-mocks (2.13.1)
133-
rspec-rails (2.13.2)
128+
remotipart (1.2.1)
129+
rspec-core (3.0.0)
130+
rspec-support (~> 3.0.0)
131+
rspec-expectations (3.0.0)
132+
diff-lcs (>= 1.2.0, < 2.0)
133+
rspec-support (~> 3.0.0)
134+
rspec-mocks (3.0.1)
135+
rspec-support (~> 3.0.0)
136+
rspec-rails (3.0.1)
134137
actionpack (>= 3.0)
135138
activesupport (>= 3.0)
136139
railties (>= 3.0)
137-
rspec-core (~> 2.13.0)
138-
rspec-expectations (~> 2.13.0)
139-
rspec-mocks (~> 2.13.0)
140-
safe_yaml (0.9.3)
141-
sass (3.2.9)
142-
sass-rails (4.0.0)
143-
railties (>= 4.0.0.beta, < 5.0)
144-
sass (>= 3.1.10)
145-
sprockets-rails (~> 2.0.0)
146-
sdoc (0.3.20)
147-
json (>= 1.1.3)
148-
rdoc (~> 3.10)
149-
sprockets (2.10.0)
140+
rspec-core (~> 3.0.0)
141+
rspec-expectations (~> 3.0.0)
142+
rspec-mocks (~> 3.0.0)
143+
rspec-support (~> 3.0.0)
144+
rspec-support (3.0.0)
145+
safe_yaml (1.0.3)
146+
sass (3.2.19)
147+
sass-rails (4.0.3)
148+
railties (>= 4.0.0, < 5.0)
149+
sass (~> 3.2.0)
150+
sprockets (~> 2.8, <= 2.11.0)
151+
sprockets-rails (~> 2.0)
152+
sdoc (0.4.0)
153+
json (~> 1.8)
154+
rdoc (~> 4.0, < 5.0)
155+
sprockets (2.11.0)
150156
hike (~> 1.2)
151157
multi_json (~> 1.0)
152158
rack (~> 1.0)
153159
tilt (~> 1.1, != 1.3.0)
154-
sprockets-rails (2.0.0)
160+
sprockets-rails (2.1.3)
155161
actionpack (>= 3.0)
156162
activesupport (>= 3.0)
157163
sprockets (~> 2.8)
158-
thin (1.5.1)
164+
thin (1.6.2)
159165
daemons (>= 1.0.9)
160-
eventmachine (>= 0.12.6)
166+
eventmachine (>= 1.0.0)
161167
rack (>= 1.0.0)
162-
thor (0.18.1)
163-
thread_safe (0.1.0)
164-
atomic
168+
thor (0.19.1)
169+
thread_safe (0.3.4)
165170
tilt (1.4.1)
166-
treetop (1.4.14)
171+
treetop (1.4.15)
167172
polyglot
168173
polyglot (>= 0.3.1)
169-
turbolinks (1.2.0)
174+
turbolinks (2.2.2)
170175
coffee-rails
171-
tzinfo (0.3.37)
172-
uglifier (2.1.1)
176+
tzinfo (1.2.1)
177+
thread_safe (~> 0.1)
178+
uglifier (2.5.0)
173179
execjs (>= 0.3.0)
174-
multi_json (~> 1.0, >= 1.0.2)
175-
warden (1.2.1)
180+
json (>= 1.8.0)
181+
warden (1.2.3)
176182
rack (>= 1.0)
177183

178184
PLATFORMS
179185
ruby
180186

181187
DEPENDENCIES
182-
coffee-rails (~> 4.0.0)
188+
coffee-rails (~> 4.0)
183189
devise
184190
figaro
185191
jbuilder (~> 1.2)
186192
jquery-rails
187193
letter_opener
188194
mysql2
189-
rails (= 4.0.0)
195+
rails (= 4.1)
190196
rails_admin
191197
rspec-rails
192-
sass-rails (~> 4.0.0)
198+
sass-rails (~> 4.0)
193199
sdoc
194200
thin
195201
turbolinks

README.rdoc

100644100755
File mode changed.

Rakefile

100644100755
File mode changed.

app/assets/images/.keep

100644100755
File mode changed.

app/assets/images/ghc-small-umbrella.png

100644100755
File mode changed.

app/assets/javascripts/application.js

100644100755
File mode changed.

app/assets/javascripts/pages.js.coffee

100644100755
File mode changed.

app/assets/stylesheets/application.css

100644100755
File mode changed.

app/assets/stylesheets/base.css.scss

100644100755
File mode changed.

app/assets/stylesheets/bootstrap.css

100644100755
File mode changed.

app/assets/stylesheets/pages.css.scss

100644100755
File mode changed.

app/controllers/application_controller.rb

100644100755
File mode changed.

app/controllers/concerns/.keep

100644100755
File mode changed.

app/controllers/pages_controller.rb

100644100755
File mode changed.

app/helpers/application_helper.rb

100644100755
File mode changed.

app/helpers/pages_helper.rb

100644100755
File mode changed.

app/mailers/.keep

100644100755
File mode changed.

app/mailers/monthly_fee_mailer.rb

100644100755
File mode changed.

app/models/.keep

100644100755
File mode changed.

app/models/concerns/.keep

100644100755
File mode changed.

app/models/user.rb

100644100755
File mode changed.

app/views/layouts/application.html.erb

100644100755
File mode changed.

app/views/monthly_fee_mailer/remember_to_pay_email.text.erb

100644100755
+4
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ Aqueles que não tem condições de pagar a mensalidade podem entrar em contato
1818
O programa “starving hacker” permite que um associado do Garoa permaneça por até três meses sem pagamento de mensalidade.
1919

2020
Os associados que ficarem por três meses ou mais sem o pagamento da mensalidade sem justificativa poderão perder o status de associado do Garoa, a ser votado em reunião do Conselho Manda Chuva.
21+
22+
Grato pela atenção,
23+
24+
Tesouraria

app/views/pages/index.html.erb

100644100755
File mode changed.

config.ru

100644100755
File mode changed.

config/application.rb

100644100755
File mode changed.

config/boot.rb

100644100755
File mode changed.

config/database.yml

100644100755
File mode changed.

config/environment.rb

100644100755
File mode changed.

config/environments/development.rb

100644100755
File mode changed.

config/environments/production.rb

100644100755
File mode changed.

config/environments/test.rb

100644100755
File mode changed.

config/initializers/backtrace_silencers.rb

100644100755
File mode changed.

config/initializers/devise.rb

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494

9595
# If true, uses the password salt as remember token. This should be turned
9696
# to false if you are not using database authenticatable.
97-
config.use_salt_as_remember_token = true
97+
# config.use_salt_as_remember_token = true
9898

9999
# Options to be passed to the created cookie. For instance, you can set
100100
# :secure => true in order to force SSL only cookies.

config/initializers/filter_parameter_logging.rb

100644100755
File mode changed.

config/initializers/inflections.rb

100644100755
File mode changed.

config/initializers/mime_types.rb

100644100755
File mode changed.

config/initializers/rails_admin.rb

100644100755
File mode changed.

config/initializers/secret_token.rb

100644100755
File mode changed.

config/initializers/session_store.rb

100644100755
File mode changed.

config/initializers/wrap_parameters.rb

100644100755
File mode changed.

config/locales/devise.en.yml

100644100755
File mode changed.

config/locales/en.yml

100644100755
File mode changed.

config/locales/pt-BR.yml

100644100755
File mode changed.

config/routes.rb

100644100755
File mode changed.

db/migrate/20130628201608_devise_create_users.rb

100644100755
File mode changed.

db/migrate/20130628201609_create_rails_admin_histories_table.rb

100644100755
File mode changed.

db/migrate/20130806174634_add_fields_to_users.rb

100644100755
File mode changed.

db/schema.rb

100644100755
File mode changed.

db/seeds.rb

100644100755
File mode changed.

lib/assets/.keep

100644100755
File mode changed.

lib/tasks/.keep

100644100755
File mode changed.

lib/tasks/load_users_csv.rake

100644100755
File mode changed.

lib/tasks/send_emails.rake

100644100755
File mode changed.

log/.keep

100644100755
File mode changed.

public/404.html

100644100755
File mode changed.

public/422.html

100644100755
File mode changed.

public/500.html

100644100755
File mode changed.

public/favicon.ico

100644100755
File mode changed.

public/robots.txt

100644100755
File mode changed.

spec/spec_helper.rb

100644100755
File mode changed.

vendor/assets/javascripts/.keep

100644100755
File mode changed.

vendor/assets/stylesheets/.keep

100644100755
File mode changed.

0 commit comments

Comments
 (0)