Skip to content

Commit

Permalink
remove recruiting rant ref; upgrade ruby/rails; git-ignore cache
Browse files Browse the repository at this point in the history
  • Loading branch information
davearonson committed May 9, 2013
1 parent 3f93d9c commit 8df204a
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 86 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -5,3 +5,4 @@ tmp/
.sass-cache/
.redcar/
vendor/ruby
vendor/cache
2 changes: 1 addition & 1 deletion .rvmrc
@@ -1 +1 @@
rvm 1.9.3-head
rvm 2.0.0
8 changes: 4 additions & 4 deletions Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.1.10'
gem 'rails', '3.2.13'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
Expand All @@ -9,9 +9,9 @@ gem 'rails', '3.1.10'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.1.4'
gem 'coffee-rails', '~> 3.1.1'
gem 'uglifier', '>= 1.0.3'
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
end

gem 'jquery-rails'
Expand Down
152 changes: 75 additions & 77 deletions Gemfile.lock
@@ -1,130 +1,128 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.1.10)
actionpack (= 3.1.10)
mail (~> 2.3.3)
actionpack (3.1.10)
activemodel (= 3.1.10)
activesupport (= 3.1.10)
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.6)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
activemodel (3.1.10)
activesupport (= 3.1.10)
sprockets (~> 2.2.1)
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.10)
activemodel (= 3.1.10)
activesupport (= 3.1.10)
arel (~> 2.2.3)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.1.10)
activemodel (= 3.1.10)
activesupport (= 3.1.10)
activesupport (3.1.10)
multi_json (>= 1.0, < 1.3)
activeresource (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
ansi (1.4.3)
arel (2.2.3)
arel (3.0.2)
bcrypt-ruby (3.0.1)
builder (3.0.4)
coffee-rails (3.1.1)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.4.0)
devise (2.2.0)
coffee-script-source (1.6.2)
devise (2.2.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
diff-lcs (1.1.3)
diff-lcs (1.2.4)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.1.0)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
hike (1.2.1)
hike (1.2.2)
i18n (0.6.1)
jquery-rails (2.1.4)
journey (1.0.4)
jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.6)
mail (2.3.3)
json (1.7.7)
mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.2.0)
nokogiri (1.5.6)
mime-types (1.23)
multi_json (1.7.3)
nokogiri (1.5.9)
orm_adapter (0.4.0)
pg (0.14.1)
pg (0.15.1)
polyglot (0.3.3)
rack (1.3.8)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.1.10)
actionmailer (= 3.1.10)
actionpack (= 3.1.10)
activerecord (= 3.1.10)
activeresource (= 3.1.10)
activesupport (= 3.1.10)
rails (3.2.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
bundler (~> 1.0)
railties (= 3.1.10)
railties (3.1.10)
actionpack (= 3.1.10)
activesupport (= 3.1.10)
railties (= 3.2.13)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (10.0.3)
rdoc (3.12)
thor (>= 0.14.6, < 2.0)
rake (10.0.4)
rdoc (3.12.2)
json (~> 1.4)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.1)
rspec-rails (2.12.1)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.1)
rspec-rails (2.13.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
sass (3.2.5)
sass-rails (3.1.6)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
sass (3.2.8)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3.2)
sprockets (2.0.4)
tilt (~> 1.3)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
thor (0.14.6)
tilt (1.3.3)
sqlite3 (1.3.7)
thor (0.18.1)
tilt (1.4.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
turn (0.9.6)
ansi
tzinfo (0.3.35)
uglifier (1.3.0)
tzinfo (0.3.37)
uglifier (2.1.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
warden (1.2.1)
Expand All @@ -138,15 +136,15 @@ PLATFORMS
ruby

DEPENDENCIES
coffee-rails (~> 3.1.1)
coffee-rails
devise
factory_girl
jquery-rails
pg
rails (= 3.1.10)
rails (= 3.2.13)
rspec-rails
sass-rails (~> 3.1.4)
sass-rails
sqlite3
turn
uglifier (>= 1.0.3)
uglifier
webrat (= 0.7.1)
7 changes: 3 additions & 4 deletions app/views/layouts/application.html.erb
Expand Up @@ -31,11 +31,10 @@
</div>
</div>
<div id="author_links">
<%= link_to "Author's Main Web Site", 'http://www.davearonson.com/' %><br/>
<%= link_to "Author's Main Web Site", 'http://www.codosaur.us/' %><br/>
Author's Blogs:<br/>
<%= link_to "Programming", 'http://www.codosaur.us/' %> |
<%= link_to "Personal Excellence", 'http://www.dare2xl.com/' %> |
<%= link_to "Recruiting Rants (NEW)", 'http://www.recruitingrants.com/' %>
<%= link_to "Programming", 'http://blog.codosaur.us/' %> |
<%= link_to "Personal Excellence", 'http://www.dare2xl.com/' %>
</div>
</div>
</div>
Expand Down

0 comments on commit 8df204a

Please sign in to comment.