Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Commit d71157a

Browse files
committed
updated to new thank_you
1 parent 931bcdd commit d71157a

File tree

5 files changed

+115
-154
lines changed

5 files changed

+115
-154
lines changed

Gemfile

+15-24
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,34 @@ gemspec
77
source :gemcutter
88
source 'http://gems.github.com'
99

10-
source :gemcutter
11-
source 'http://gems.github.com'
12-
13-
gem 'rails', '3.2.7'
14-
gem 'rake', '0.9.2.2'
10+
gem 'rails', '3.2.11'
1511

1612
gem 'sidekiq', '= 2.4.0'
1713
gem 'sinatra', require: false
1814
gem 'foreman'
19-
# Database and data related [Putting pg to the end because of a weird bug with Lion, pg and openssl]
15+
gem 'best_in_place'
16+
17+
gem 'state_machine', require: 'state_machine/core'
18+
19+
# Database and data related
2020
gem 'pg'
21-
gem 'foreigner'
22-
gem 'activerecord-postgresql-adapter'
21+
gem 'pg_search'
22+
gem 'postgres-copy'
23+
gem 'schema_plus'
2324

24-
gem 'catarse_paypal_express', git: 'git://github.com/devton/catarse_paypal_express.git'
25+
gem 'catarse_paypal_express', git: 'git://github.com/devton/catarse_paypal_express.git', ref: '4fd17e269395ee4b3a32528ace0bcb7eec57a953'
2526
#gem 'catarse_paypal_express', path: '../catarse_paypal_express'
2627
#gem 'catarse_moip', git: 'git://github.com/devton/catarse_moip.git'
2728
#gem 'catarse_moip', path: '../catarse_moip'
2829
gem 'moip', git: 'git://github.com/moiplabs/moip-ruby.git'
2930

30-
gem 'maxim-sexy_pg_constraints'
31-
gem 'dalli'
3231
gem 'draper'
3332

3433
# Frontend stuff
35-
gem 'jquery-rails'
3634
gem 'slim'
3735
gem 'slim-rails'
36+
gem 'jquery-rails'
37+
gem 'initjs'
3838

3939
# Authentication and Authorization
4040
gem 'omniauth', "~> 1.1.0"
@@ -45,15 +45,15 @@ gem 'omniauth-github', '~> 1.0.1'
4545
gem 'omniauth-linkedin', '~> 0.0.6'
4646
gem 'omniauth-yahoo', '~> 0.0.4'
4747
gem 'devise', '1.5.3'
48-
gem 'cancan'
48+
gem 'cancan', git: 'git://github.com/ryanb/cancan.git', branch: '2.0', ref: 'f1cebde51a87be149b4970a3287826bb63c0ac0b'
4949

5050

5151
# Error reporting
5252
gem "airbrake"
5353

5454
# Email marketing
5555
#gem 'mailchimp'
56-
gem 'catarse_mailchimp'
56+
gem 'catarse_mailchimp', git: 'git://github.com/devton/catarse_mailchimp'
5757

5858
# HTML manipulation and formatting
5959
gem 'formtastic', "~> 2.1.1"
@@ -83,23 +83,18 @@ gem 'unicode'
8383
gem 'enumerate_it'
8484
gem 'httparty', '~> 0.6.1'
8585
gem "rack-timeout"
86-
gem 'tumblr-api'
8786

8887
# Translations
8988
gem 'http_accept_language'
90-
gem 'web_translate_it'
9189
gem 'routing-filter' #, :git => 'git://github.com/svenfuchs/routing-filter.git'
9290

9391
# Administration
94-
gem 'activeadmin', git: 'git://github.com/gregbell/active_admin.git'
9592
gem "meta_search", "1.1.3"
9693

9794
# Payment
9895
gem 'activemerchant', '1.17.0', require: 'active_merchant'
9996
gem 'httpclient', '2.2.5'
100-
gem 'selenium-webdriver', '~> 2.25.0'
101-
gem 'bourbon'
102-
gem 'paypal-express', :require => 'paypal'
97+
gem 'selenium-webdriver'
10398

10499
# Server
105100
gem 'thin'
@@ -113,12 +108,9 @@ group :assets do
113108
end
114109

115110
group :test, :development do
116-
gem 'annotate'
117111
gem 'launchy'
118112
gem 'database_cleaner'
119-
gem 'steak', "~> 1.1.0"
120113
gem 'rspec-rails', "~> 2.10.0"
121-
gem 'rcov', '= 0.9.11'
122114
gem 'mocha', '0.10.4'
123115
gem 'shoulda'
124116
gem 'factory_girl_rails', '1.7.0'
@@ -127,5 +119,4 @@ end
127119

128120
group :development do
129121
gem 'mailcatcher'
130-
gem 'ruby-debug19'
131122
end

0 commit comments

Comments
 (0)