Permalink
Browse files

upgraded to Rails 3.1, some style changes to header, deleted extraneo…

…us rake task
  • Loading branch information...
1 parent 05b9f1d commit b9fa19b48556dd25d09195d101444d46a7c2ebdd @ckundo committed Jan 4, 2012
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.0'
+gem 'rails', '3.1.3'
gem 'jquery-rails'
gem 'haml-rails'
@@ -10,7 +10,6 @@ gem 'geocoder'
group :assets do
gem 'sass-rails'
- gem 'coffee-rails', "~> 3.1.0"
gem 'uglifier'
end
View
@@ -2,108 +2,99 @@ GEM
remote: http://rubygems.org/
specs:
ZenTest (4.6.2)
- actionmailer (3.1.0)
- actionpack (= 3.1.0)
+ actionmailer (3.1.3)
+ actionpack (= 3.1.3)
mail (~> 2.3.0)
- actionpack (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ actionpack (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.2)
- rack-cache (~> 1.0.3)
+ rack (~> 1.3.5)
+ rack-cache (~> 1.1)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.0)
- activemodel (3.1.0)
- activesupport (= 3.1.0)
- bcrypt-ruby (~> 3.0.0)
+ sprockets (~> 2.0.3)
+ activemodel (3.1.3)
+ activesupport (= 3.1.3)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ activerecord (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
- activesupport (3.1.0)
+ activeresource (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ activesupport (3.1.3)
multi_json (~> 1.0)
- ansi (1.3.0)
+ ansi (1.4.1)
arel (2.2.1)
- autotest-growl (0.2.14)
- bcrypt-ruby (3.0.1)
- bourbon (1.1.0)
+ autotest-growl (0.2.16)
+ bourbon (1.2.0)
sass (>= 3.1)
builder (3.0.0)
chunky_png (1.2.5)
- coffee-rails (3.1.1)
- coffee-script (>= 2.2.0)
- railties (~> 3.1.0)
- coffee-script (2.2.0)
- coffee-script-source
- execjs
- coffee-script-source (1.1.2)
- compass (0.11.5)
+ compass (0.11.6)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
diff-lcs (1.1.3)
erubis (2.7.0)
- execjs (1.2.9)
+ execjs (1.2.13)
multi_json (~> 1.0)
fssm (0.2.7)
- geocoder (1.0.5)
- haml (3.1.3)
+ geocoder (1.1.0)
+ haml (3.1.4)
haml-rails (0.3.4)
actionpack (~> 3.0)
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.16)
+ jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.1)
- libv8 (3.3.10.2)
+ json (1.6.4)
+ libv8 (3.3.10.4)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- minitest (2.7.0)
- multi_json (1.0.3)
- pg (0.11.0)
- polyglot (0.3.2)
- rack (1.3.5)
- rack-cache (1.0.3)
+ minitest (2.10.0)
+ multi_json (1.0.4)
+ pg (0.12.2)
+ polyglot (0.3.3)
+ rack (1.3.6)
+ rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0)
- actionmailer (= 3.1.0)
- actionpack (= 3.1.0)
- activerecord (= 3.1.0)
- activeresource (= 3.1.0)
- activesupport (= 3.1.0)
+ rails (3.1.3)
+ actionmailer (= 3.1.3)
+ actionpack (= 3.1.3)
+ activerecord (= 3.1.3)
+ activeresource (= 3.1.3)
+ activesupport (= 3.1.3)
bundler (~> 1.0)
- railties (= 3.1.0)
- railties (3.1.0)
- actionpack (= 3.1.0)
- activesupport (= 3.1.0)
+ railties (= 3.1.3)
+ railties (3.1.3)
+ actionpack (= 3.1.3)
+ activesupport (= 3.1.3)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
@@ -120,19 +111,18 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.7.0)
- sass (3.1.10)
- sass-rails (3.1.4)
+ sass (3.1.12)
+ sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
- sass (>= 3.1.4)
- sprockets (~> 2.0.0)
+ sass (~> 3.1.10)
tilt (~> 1.3.2)
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.4)
- therubyracer (0.9.4)
+ sqlite3 (1.3.5)
+ therubyracer (0.9.9)
libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
@@ -141,8 +131,8 @@ GEM
polyglot (>= 0.3.1)
turn (0.8.3)
ansi
- tzinfo (0.3.30)
- uglifier (1.0.4)
+ tzinfo (0.3.31)
+ uglifier (1.2.1)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -153,14 +143,13 @@ DEPENDENCIES
ZenTest
autotest-growl
bourbon
- coffee-rails (~> 3.1.0)
compass
geocoder
haml-rails
jquery-rails
minitest
pg
- rails (= 3.1.0)
+ rails (= 3.1.3)
rest-client (~> 1.6.7)
rspec-rails
sass-rails
@@ -47,7 +47,7 @@ body {
}
#header {
- margin: 0 30px 10px 0;
+ margin: 0 30px 30px 0;
float:left;
h1 {
@@ -56,14 +56,16 @@ body {
letter-spacing: 3px;
font-weight: bold;
text-transform:uppercase;
-
+ margin:0;
+
a, a:link, a:hover, a:visited {
color:$occupyist_orange;
opacity:1;
}
}
p {
+ margin:0;
font-size:120%;
color:#ccc
}
@@ -74,6 +76,7 @@ body {
p {
float:right;
+ margin:0;
}
#next-event {
View
@@ -4,12 +4,10 @@
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
development:
- adapter: postgresql
- database: occupyist_development
- encoding: utf8
- host: localhost
- username: ckundo
- password:
+ adapter: sqlite3
+ database: db/development.sqlite3
+ pool: 5
+ timeout: 5000
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
@@ -1,4 +1,4 @@
-namespace :community do
+namespace :communities do
desc 'interact with remote events'
task :update_events => :environment do
View
@@ -1,8 +0,0 @@
-namespace :community do
- desc 'interact with remote events'
-
- task :update_events => :environment do
- Meetup::Community.fetch_all
- end
-end
-
Oops, something went wrong.

0 comments on commit b9fa19b

Please sign in to comment.