Permalink
Browse files

Merge pull request #38 from archSeer/master

Update Gemfile.
  • Loading branch information...
2 parents 6455d61 + 19339e9 commit ec9368ab497f9cf36c6a4bb4c7c4c56a79d8fa5d @matiaskorhonen matiaskorhonen committed Dec 9, 2012
View
18 Gemfile
@@ -1,21 +1,21 @@
source "https://rubygems.org"
-gem "rails", "3.2.6"
+gem "rails", "3.2.9"
-gem "devise", "~> 1.5.3"
+gem "devise", "~> 2.1.2"
gem "foreman", "~> 0.51.0"
gem "haml", "~> 3.1.6"
gem "haml-rails"
gem "jquery-rails"
-gem "kaminari", "~> 0.13.0"
-gem "kronic", "~> 1.1.1"
-gem "nokogiri", "~> 1.4.4"
+gem "kaminari", "~> 0.14.1"
+gem "kronic", "~> 1.1.3"
+gem "nokogiri", "~> 1.5.5"
gem "rake"
-gem "RedCloth", "~> 4.2.3"
+gem "RedCloth", "~> 4.2.9"
gem "simple_form", "~> 1.2.2"
-gem "validates_timeliness", "~> 3.0.0"
+gem "validates_timeliness", "~> 3.0.14"
gem "yajl-ruby"
-gem "thin", "~> 1.4.1"
+gem "thin", "~> 1.5.0"
# Gems used only for assets and not required
# in production environments by default.
@@ -27,7 +27,7 @@ group :assets do
end
group :development do
- gem "sqlite3-ruby", :require => "sqlite3"
+ gem "sqlite3"
end
group :production do
View
@@ -2,44 +2,44 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
- ZenTest (4.8.1)
- actionmailer (3.2.6)
- actionpack (= 3.2.6)
+ ZenTest (4.8.3)
+ actionmailer (3.2.9)
+ actionpack (= 3.2.9)
mail (~> 2.4.4)
- actionpack (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ actionpack (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
+ journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.3)
- activemodel (3.2.6)
- activesupport (= 3.2.6)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
- activerecord (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ activerecord (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
- activesupport (3.2.6)
+ activeresource (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
+ activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.8)
+ addressable (2.3.2)
akephalos (0.2.5)
capybara (~> 0.4.0)
jruby-jars
arel (3.0.2)
autotest (4.4.6)
ZenTest (>= 4.4.1)
- awesome_print (1.0.2)
+ awesome_print (1.1.0)
bcrypt-ruby (3.0.1)
- builder (3.0.0)
+ builder (3.0.4)
capybara (0.4.1.2)
celerity (>= 0.7.9)
culerity (>= 0.2.4)
@@ -50,149 +50,152 @@ GEM
selenium-webdriver (>= 0.0.27)
xpath (~> 0.1.3)
celerity (0.9.2)
- childprocess (0.3.3)
- ffi (~> 1.0.6)
+ childprocess (0.3.6)
+ ffi (~> 1.0, >= 1.0.6)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.3)
+ coffee-script-source (1.4.0)
culerity (0.2.15)
- daemons (1.1.8)
- database_cleaner (0.8.0)
- devise (1.5.3)
+ daemons (1.1.9)
+ database_cleaner (0.9.1)
+ devise (2.1.2)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.3)
- warden (~> 1.1)
+ orm_adapter (~> 0.1)
+ railties (~> 3.1)
+ warden (~> 1.2.1)
diff-lcs (1.1.3)
erubis (2.7.0)
- eventmachine (0.12.10)
+ eventmachine (1.0.0)
execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (3.5.0)
+ factory_girl (4.1.0)
activesupport (>= 3.0.0)
- factory_girl_rails (3.5.0)
- factory_girl (~> 3.5.0)
+ factory_girl_rails (4.1.0)
+ factory_girl (~> 4.1.0)
railties (>= 3.0.0)
ffaker (1.15.0)
- ffi (1.0.11)
+ ffi (1.2.0)
font-awesome-sass-rails (2.0.0.0)
railties (>= 3.1.1)
sass-rails (>= 3.1.1)
foreman (0.51.0)
thor (>= 0.13.6)
- haml (3.1.6)
- haml-rails (0.3.4)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- haml (~> 3.0)
- railties (~> 3.0)
+ haml (3.1.7)
+ haml-rails (0.3.5)
+ actionpack (>= 3.1, < 4.1)
+ activesupport (>= 3.1, < 4.1)
+ haml (~> 3.1)
+ railties (>= 3.1, < 4.1)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
journey (1.0.4)
- jquery-rails (2.0.2)
- railties (>= 3.2.0, < 5.0)
- thor (~> 0.14)
- jruby-jars (1.6.7.2)
- json (1.7.3)
- kaminari (0.13.0)
+ jquery-rails (2.1.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ jruby-jars (1.7.1)
+ json (1.7.5)
+ kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- railties (>= 3.0.0)
kronic (1.1.3)
- launchy (2.1.0)
- addressable (~> 2.2.6)
- libwebsocket (0.1.4)
+ launchy (2.1.2)
+ addressable (~> 2.3)
+ libwebsocket (0.1.7.1)
addressable
+ websocket
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- multi_json (1.3.6)
- nokogiri (1.4.7)
- orm_adapter (0.0.7)
- pg (0.14.0)
+ multi_json (1.4.0)
+ nokogiri (1.5.5)
+ orm_adapter (0.4.0)
+ pg (0.14.1)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.6)
- actionmailer (= 3.2.6)
- actionpack (= 3.2.6)
- activerecord (= 3.2.6)
- activeresource (= 3.2.6)
- activesupport (= 3.2.6)
+ rails (3.2.9)
+ actionmailer (= 3.2.9)
+ actionpack (= 3.2.9)
+ activerecord (= 3.2.9)
+ activeresource (= 3.2.9)
+ activesupport (= 3.2.9)
bundler (~> 1.0)
- railties (= 3.2.6)
- railties (3.2.6)
- actionpack (= 3.2.6)
- activesupport (= 3.2.6)
+ railties (= 3.2.9)
+ railties (3.2.9)
+ actionpack (= 3.2.9)
+ activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
+ rake (10.0.2)
rdoc (3.12)
json (~> 1.4)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.0)
- rspec-expectations (2.11.1)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.1)
+ rspec-expectations (2.12.0)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.1)
- rspec-rails (2.11.0)
+ rspec-mocks (2.12.0)
+ rspec-rails (2.12.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.11.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
rubyzip (0.9.9)
- sass (3.1.20)
+ sass (3.2.3)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.24.0)
+ selenium-webdriver (2.27.1)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
simple_form (1.2.2)
- sprockets (2.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)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
steak (1.1.0)
rspec (>= 1.3)
- thin (1.4.1)
+ thin (1.5.0)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.15.4)
+ thor (0.16.0)
tilt (1.3.3)
- timeliness (0.3.6)
- treetop (1.4.10)
+ timeliness (0.3.7)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
- uglifier (1.2.6)
+ tzinfo (0.3.35)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (~> 1.3)
- validates_timeliness (3.0.12)
+ multi_json (~> 1.0, >= 1.0.2)
+ validates_timeliness (3.0.14)
timeliness (~> 0.3.6)
warden (1.2.1)
rack (>= 1.0)
+ websocket (1.0.4)
xpath (0.1.4)
nokogiri (~> 1.3)
yajl-ruby (1.1.0)
@@ -201,34 +204,34 @@ PLATFORMS
ruby
DEPENDENCIES
- RedCloth (~> 4.2.3)
+ RedCloth (~> 4.2.9)
akephalos
autotest
awesome_print
capybara
coffee-rails (~> 3.2.2)
database_cleaner
- devise (~> 1.5.3)
+ devise (~> 2.1.2)
factory_girl_rails
ffaker
font-awesome-sass-rails
foreman (~> 0.51.0)
haml (~> 3.1.6)
haml-rails
jquery-rails
- kaminari (~> 0.13.0)
- kronic (~> 1.1.1)
+ kaminari (~> 0.14.1)
+ kronic (~> 1.1.3)
launchy
- nokogiri (~> 1.4.4)
+ nokogiri (~> 1.5.5)
pg
- rails (= 3.2.6)
+ rails (= 3.2.9)
rake
rspec-rails
sass-rails (~> 3.2.5)
simple_form (~> 1.2.2)
- sqlite3-ruby
+ sqlite3
steak
- thin (~> 1.4.1)
+ thin (~> 1.5.0)
uglifier
- validates_timeliness (~> 3.0.0)
+ validates_timeliness (~> 3.0.14)
yajl-ruby
@@ -39,7 +39,7 @@
= navigate_to :timeline, "Timeline", timeline_organization_path(current_organization), :class => "button pictos time"
= link_to "New Project", new_project_path, :class => "button pictos new"
= navigate_to :account, "Account", edit_user_registration_path, :class => "account"
- = link_to "Logout", destroy_user_session_path, :class => "logout"
+ = link_to "Logout", destroy_user_session_path, :class => "logout", :method => :delete
- else
- if controller.controller_name == "sessions" && controller.action_name == "new"
= link_to "Sign up", new_user_registration_path, :class => "button", :style => "float:right"
@@ -18,7 +18,7 @@
#activity
%ol#statuses
= render @statuses
- - if @statuses.num_pages > 1
+ - if @statuses.total_pages > 1
= link_to "Show more", page_project_statuses_path(@project, :page => 2), :remote => true, :id => "more_statuses_link", :class => "button"
#sidebar.grid_7.push_2
@@ -5,6 +5,6 @@ $("#statuses").append("<%= escape_javascript(render @statuses) %>");
$.scrollTo("#status_<%= @statuses.first.id %>", 800);
<% end %>
-<% if @statuses.empty? || params[:page].to_i >= @statuses.num_pages %>
+<% if @statuses.empty? || params[:page].to_i >= @statuses.total_pages %>
$("#more_statuses_link").fadeOut();
<% end %>
Oops, something went wrong.

0 comments on commit ec9368a

Please sign in to comment.