Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: michel/Ringr
base: 37b1b7c72b
...
head fork: michel/Ringr
compare: e9854d6b0f
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 21 additions and 21 deletions.
  1. +6 −7 Gemfile
  2. +15 −14 Gemfile.lock
View
13 Gemfile
@@ -1,8 +1,12 @@
source 'https://rubygems.org'
gem 'rails', '3.2.2'
-gem 'mongoid'
-gem 'bson_ext'
+gem 'twilio-ruby'
+gem 'heroku'
+gem 'jquery-rails'
+gem 'haml-rails'
+gem "draper", "~> 0.11.1"
+gem 'twitter-bootstrap-rails', '~> 2.0.1.0'
group :assets do
gem 'sass-rails', '~> 3.2.3'
@@ -10,10 +14,6 @@ group :assets do
gem 'uglifier', '>= 1.0.3'
end
-gem 'jquery-rails'
-gem 'haml-rails'
-gem "draper", "~> 0.11.1"
-gem 'twitter-bootstrap-rails'
group :test, :development do
gem 'rspec-rails'
@@ -24,4 +24,3 @@ group :test, :development do
gem 'ruby-debug19'
end
-gem 'twilio-ruby'
View
29 Gemfile.lock
@@ -28,11 +28,9 @@ GEM
activesupport (3.2.2)
i18n (~> 0.6)
multi_json (~> 1.0)
+ addressable (2.2.7)
archive-tar-minitar (0.5.2)
arel (3.0.2)
- bson (1.6.1)
- bson_ext (1.6.1)
- bson (~> 1.6.1)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -83,6 +81,11 @@ GEM
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
+ heroku (2.21.3)
+ launchy (>= 0.3.2)
+ netrc (~> 0.7.1)
+ rest-client (~> 1.6.1)
+ rubyzip
hike (1.2.1)
i18n (0.6.0)
journey (1.0.3)
@@ -92,6 +95,8 @@ GEM
json (1.6.5)
jwt (0.1.4)
json (>= 1.2.4)
+ launchy (2.1.0)
+ addressable (~> 2.2.6)
less (2.0.11)
commonjs (~> 0.2.0)
therubyracer (~> 0.9.9)
@@ -106,13 +111,8 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- mongo (1.6.1)
- bson (~> 1.6.1)
- mongoid (2.4.6)
- activemodel (~> 3.1)
- mongo (~> 1.3)
- tzinfo (~> 0.3.22)
multi_json (1.1.0)
+ netrc (0.7.1)
nokogiri (1.5.2)
polyglot (0.3.3)
rack (1.4.1)
@@ -140,6 +140,8 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
+ rest-client (1.6.7)
+ mime-types (>= 1.16)
rspec (2.9.0)
rspec-core (~> 2.9.0)
rspec-expectations (~> 2.9.0)
@@ -191,9 +193,9 @@ GEM
builder (>= 2.1.2)
jwt (>= 0.1.2)
multi_json (>= 1.0.3)
- twitter-bootstrap-rails (2.0.4)
+ twitter-bootstrap-rails (2.0.1.0)
actionpack (>= 3.1)
- less-rails (~> 2.1.8)
+ less-rails (~> 2.1.6)
railties (>= 3.1)
tzinfo (0.3.32)
uglifier (1.2.3)
@@ -206,20 +208,19 @@ PLATFORMS
ruby
DEPENDENCIES
- bson_ext
coffee-rails (~> 3.2.1)
cucumber-rails
database_cleaner
draper (~> 0.11.1)
factory_girl_rails
haml-rails
+ heroku
jquery-rails
- mongoid
rails (= 3.2.2)
rspec-rails
ruby-debug19
sass-rails (~> 3.2.3)
shoulda (~> 2.11.3)
twilio-ruby
- twitter-bootstrap-rails
+ twitter-bootstrap-rails (~> 2.0.1.0)
uglifier (>= 1.0.3)

No commit comments for this range

Something went wrong with that request. Please try again.