Skip to content

Commit 75afe44

Browse files
committed
1
1
1 parent 5fe0868 commit 75afe44

File tree

2 files changed

+141
-80
lines changed

2 files changed

+141
-80
lines changed

Gemfile

+31-34
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,100 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', ' >= 3.1'
4-
gem 'rails-i18n', '>= 4.0.9'
3+
gem 'rails', '~> 4.0.12'
4+
gem 'rails-i18n'
55

66
gem 'mysql2', '~> 0.3.21'
77
gem 'daemons-rails'
8-
gem 'redis-rails', '>= 5.0.2'
9-
gem 'responders', '~> 2.0'
8+
gem 'redis-rails'
109

1110
gem 'rotp'
1211
gem 'json'
1312
gem 'jbuilder'
1413
gem 'bcrypt-ruby', '~> 3.1.2'
1514

16-
gem 'doorkeeper', '~> 1.4.2'
17-
gem 'omniauth', '>= 1.3.2'
15+
gem 'doorkeeper', '~> 1.4.1'
16+
gem 'omniauth', '~> 1.2.1'
1817
gem 'omniauth-identity', '~> 1.1.1'
1918
gem 'omniauth-weibo-oauth2', '~> 0.4.0'
2019

21-
gem 'figaro', '>= 0.7.0'
20+
gem 'figaro'
2221
gem 'hashie'
2322

2423
gem 'aasm', '~> 3.4.0'
2524
gem 'amqp', '~> 1.3.0'
2625
gem 'bunny', '~> 1.2.1'
2726
gem 'cancancan'
2827
gem 'enumerize'
29-
gem 'datagrid', '>= 1.5.7'
30-
gem 'acts-as-taggable-on', '>= 3.0.1'
31-
gem 'kaminari', '>= 0.15.1'
28+
gem 'datagrid'
29+
gem 'acts-as-taggable-on'
30+
gem 'kaminari'
3231
gem 'paranoid2'
33-
gem 'active_hash', '~> 1.5.0'
32+
gem 'active_hash'
3433
gem 'http_accept_language'
3534
gem "globalize", "~> 4.0.0"
3635
gem 'paper_trail', '~> 3.0.1'
3736
gem 'rails-observers'
3837
gem 'country_select', '~> 2.1.0'
39-
gem 'activerecord', '>= 3.0.18'
38+
4039
gem 'gon', '~> 5.2.0'
4140
gem 'pusher'
4241
gem 'eventmachine', '~> 1.0.4'
4342
gem 'em-websocket', '~> 0.5.1'
4443

45-
gem 'simple_form', '~> 3.1.1'
46-
gem 'slim-rails', '>= 3.1.3'
47-
gem 'sass-rails', '>= 5.0.6'
48-
gem 'coffee-rails', '>= 4.2.2'
49-
gem 'uglifier', '>= 2.7.2'
50-
gem "jquery-rails", ">= 3.1.3"
44+
gem 'simple_form', '~> 3.1.0'
45+
gem 'slim-rails'
46+
gem 'sass-rails'
47+
gem 'coffee-rails'
48+
gem 'uglifier'
49+
gem "jquery-rails"
5150
gem "angularjs-rails"
5251
gem 'bootstrap-sass', '~> 3.2.0.2'
53-
gem 'bootstrap-wysihtml5-rails', '>= 0.3.1.24'
52+
gem 'bootstrap-wysihtml5-rails'
5453
gem 'font-awesome-sass', '~> 4.5.0.0'
5554
gem 'bourbon'
56-
gem 'momentjs-rails', '>= 2.17.1'
55+
gem 'momentjs-rails'
5756
gem 'eco'
5857
gem 'browser', '~> 0.8.0'
5958
gem 'rbtree'
6059
gem 'liability-proof', '0.0.9'
6160
gem 'whenever', '~> 0.9.2'
62-
gem 'grape', '>= 1.1.0'
61+
gem 'grape', '~> 0.7.0'
6362
gem 'grape-entity', '~> 0.4.2'
6463
gem 'grape-swagger', '~> 0.7.2'
65-
gem 'rack-attack', '~> 4.3.1'
66-
gem 'easy_table', '>= 0.0.6'
64+
gem 'rack-attack', '~> 3.0.0'
65+
gem 'easy_table'
6766
gem 'phonelib', '~> 0.3.5'
6867
gem 'twilio-ruby', '~> 3.11'
6968
gem 'unread', github: 'gravio-net/unread'
7069
gem 'carrierwave', '~> 0.10.0'
7170
gem 'simple_captcha', github: 'gravio-net/simple-captcha', branch: '0.2.2.1'
72-
gem 'rest-client', '>= 1.7.3'
73-
gem 'activesupport', '>= 4.1.11'
74-
gem 'rack', '>= 1.5.4'
71+
gem 'rest-client', '~> 1.6.8'
7572

7673
group :development, :test do
77-
gem 'factory_girl_rails', '>= 4.9.0'
74+
gem 'factory_girl_rails'
7875
gem 'faker', '~> 1.4.3'
7976
gem 'mina'
8077
gem 'mina-slack', github: 'gravio-net/mina-slack'
81-
gem 'meta_request', '>= 0.4.3'
78+
gem 'meta_request'
8279
gem 'better_errors'
8380
gem 'binding_of_caller'
8481
gem 'pry-rails'
85-
gem 'quiet_assets', '>= 1.1.0'
86-
gem 'mails_viewer', '>= 0.1.2'
82+
gem 'quiet_assets'
83+
gem 'mails_viewer'
8784
gem 'timecop'
8885
gem 'dotenv-rails'
89-
gem 'rspec-rails', '>= 3.7.1'
86+
gem 'rspec-rails'
9087
gem 'byebug'
9188
end
9289

9390
group :test do
9491
gem 'database_cleaner'
9592
gem 'mocha', :require => false
9693
gem 'shoulda-matchers'
97-
gem 'capybara', '>= 2.15.4'
94+
gem 'capybara'
9895
gem 'launchy'
99-
gem 'selenium-webdriver', '>= 2.39.0'
100-
gem 'poltergeist', '>= 1.16.0'
96+
gem 'selenium-webdriver'
97+
gem 'poltergeist'
10198

10299
# rspec-rails rely on test-unit if rails version less then 4.1.0
103100
# but test-unit has been removed from ruby core since 2.2.0

0 commit comments

Comments
 (0)