Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'

gem 'rails', '~> 4.1.10'

gem 'pg'
gem 'pg' #env ARCHFLAGS="-arch x86_64"
gem 'counter_culture'
gem 'after_commit_action'
gem 'ransack'
Expand Down Expand Up @@ -106,9 +106,6 @@ group :development do
gem 'meta_request'
gem 'foreman', :require => false

# Use puma for development
gem 'puma', :require => false

end

group :test do
Expand All @@ -127,6 +124,7 @@ end

group :heroku, :production do
gem 'unicorn', :require => false
gem 'puma', :require => false
end

gem 'execjs'
Expand Down
5 changes: 3 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -234,15 +234,13 @@ GEM
activeresource (>= 2.3.0)
pg (0.17.1)
pivotal-tracker (0.5.12)
builder
builder
crack
happymapper (>= 0.3.2)
nokogiri (>= 1.4.3)
nokogiri (>= 1.5.5)
nokogiri-happymapper (>= 0.5.4)
rest-client (~> 1.6.0)
rest-client (~> 1.6.0)
polyamorous (1.1.0)
activerecord (>= 3.0)
premailer (1.8.2)
Expand Down Expand Up @@ -478,3 +476,6 @@ DEPENDENCIES
webmock
xmpp4r
yajl-ruby

BUNDLED WITH
1.10.4