home/ocelots
2
0
Fork 0
mirror of https://github.com/wahyd4/ocelots.git synced 2026-08-09 04:56:21 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of heroku.com:ocelots-staging

Browse Source
This commit is contained in:
junv
2013-02-04 11:12:52 +08:00
parent 7a1241c218 9f2fd47e0f
commit 5e76ffe879
4 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+3 -3
View File
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem 'rails', '3.2.9'
gem 'rails', '3.2.11'
gem 'slim'
gem 'paperclip'
gem 'aws-sdk'
@@ -24,15 +24,15 @@ group :assets do
end
group :development, :test do
gem 'rspec-rails'
gem 'github'
gem 'tddium'
gem "rails_best_practices", "~> 1.11.1"
gem "flay"
gem 'rspec-rails'
gem 'simplecov'
gem 'machinist'
gem 'cucumber-rails' , :require => false
gem 'capybara'
gem 'database_cleaner'
gem 'selenium-webdriver'
end
end
Gemfile.lock
+30 -30
View File
@@ -1,12 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.9)
actionpack (= 3.2.9)
actionmailer (3.2.11)
actionpack (= 3.2.11)
mail (~> 2.4.4)
actionpack (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
actionpack (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -14,18 +14,18 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.9)
activesupport (= 3.2.9)
activemodel (3.2.11)
activesupport (= 3.2.11)
builder (~> 3.0.0)
activerecord (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
activerecord (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
activesupport (3.2.9)
activeresource (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
@@ -111,7 +111,7 @@ GEM
jquery-rails (2.1.1)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
json (1.7.6)
jwt (0.1.5)
multi_json (>= 1.0)
launchy (2.1.2)
@@ -125,7 +125,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.3.7)
multi_json (1.5.0)
multi_xml (0.5.1)
multipart-post (1.1.5)
nokogiri (1.5.5)
@@ -141,21 +141,21 @@ GEM
pusher (0.11.1)
multi_json (~> 1.0)
signature (~> 0.1.6)
rack (1.4.1)
rack (1.4.3)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.9)
actionmailer (= 3.2.9)
actionpack (= 3.2.9)
activerecord (= 3.2.9)
activeresource (= 3.2.9)
activesupport (= 3.2.9)
rails (3.2.11)
actionmailer (= 3.2.11)
actionpack (= 3.2.11)
activerecord (= 3.2.11)
activeresource (= 3.2.11)
activesupport (= 3.2.11)
bundler (~> 1.0)
railties (= 3.2.9)
railties (= 3.2.11)
rails_best_practices (1.11.1)
activesupport
awesome_print
@@ -164,14 +164,14 @@ GEM
erubis
i18n
progressbar
railties (3.2.9)
actionpack (= 3.2.9)
activesupport (= 3.2.9)
railties (3.2.11)
actionpack (= 3.2.11)
activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.2)
rake (10.0.3)
rdiscount (1.6.8)
rdoc (3.12)
json (~> 1.4)
@@ -215,7 +215,7 @@ GEM
slim (1.3.0)
temple (~> 0.4.1)
tilt (~> 1.3.3)
sprockets (2.2.1)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@@ -270,7 +270,7 @@ DEPENDENCIES
paperclip
pg
pusher
rails (= 3.2.9)
rails (= 3.2.11)
rails_best_practices (~> 1.11.1)
rdiscount
rspec-rails
Rakefile
+1 -1
View File
@@ -6,4 +6,4 @@ require File.expand_path('../config/application', __FILE__)
Ocelots::Application.load_tasks
task :ci => %w(db:migrate db:test:prepare analyzer:flay analyzer:rails_best_practices simplecov stats)
task :ci => %w(db:migrate db:test:prepare analyzer:flay analyzer:rails_best_practices simplecov stats)
lib/google_oauth.rb
+1 -1
View File
@@ -3,7 +3,7 @@ require 'google/api_client'
module GoogleOauth
def google_oauth_url
google_client.authorization.authorization_uri.to_s
google_client.authorizNation.authorization_uri.to_s
end
def verify_google_oauth