Skip to content

Commit a42ed5e

Browse files
author
Maxim
committedFeb 28, 2020
👮
1 parent b0dc5bb commit a42ed5e

File tree

133 files changed

+769
-586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+769
-586
lines changed
 

‎Gemfile

+21-18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
source 'https://rubygems.org'
24

35
ruby '2.4.2'
@@ -6,64 +8,65 @@ ruby '2.4.2'
68
gem 'breakpoint'
79
gem 'carrierwave'
810
gem 'coffee-rails'
11+
gem 'compass-rails'
912
gem 'fog', '1.41.0' # 1.42. depends on a newer version of json which breaks mandrill-mailer
13+
gem 'graphql'
1014
gem 'gravatar_image_tag'
1115
gem 'haml-rails'
16+
gem 'i18n-js'
1217
gem 'jbuilder'
1318
gem 'jquery-rails'
1419
gem 'kaminari'
1520
gem 'mini_magick'
1621
gem 'mobile-fu'
22+
gem 'omniauth'
23+
gem 'omniauth-facebook'
24+
gem 'omniauth-twitter'
1725
gem 'pg', '~> 0.18'
1826
gem 'puma'
27+
gem 'rack-cors', require: 'rack/cors'
1928
gem 'rack-tracker'
20-
gem 'rails_admin'
21-
gem 'rails-i18n'
2229
gem 'rails', '~> 5.1', '>= 5.1.4'
30+
gem 'rails-i18n'
31+
gem 'rails_admin'
32+
gem 'react-rails'
2333
gem 'redcarpet'
2434
gem 'sass-rails'
35+
gem 'sprockets', '>= 3.7.2'
2536
gem 'uglifier'
26-
gem "compass-rails"
27-
gem "omniauth-facebook"
28-
gem "omniauth-twitter"
29-
gem "omniauth"
30-
gem "react-rails"
3137
gem 'webpacker', '~> 3.0'
32-
gem 'i18n-js'
33-
gem 'graphql'
34-
gem 'rack-cors', require: 'rack/cors'
35-
gem "sprockets", ">= 3.7.2"
3638

3739
gem 'sentry-raven'
3840
# gem 'quiet_assets' Doesn't work anymore
39-
gem 'pebble_timeline'
4041
gem 'mandrill_mailer'
42+
gem 'pebble_timeline'
4143

4244
group :development do
4345
gem 'better_errors'
4446
gem 'binding_of_caller'
45-
gem 'smurfville'
47+
gem 'faker', '~> 1.8', '>= 1.8.7'
4648
gem 'fontello_rails_converter'
47-
gem 'listen'
4849
gem 'graphiql-rails'
49-
gem 'faker', '~> 1.8', '>= 1.8.7'
50+
gem 'listen'
51+
gem 'rubocop'
52+
gem 'smurfville'
5053
end
5154

5255
group :development, :test do
5356
gem 'factory_bot_rails'
54-
gem 'rspec-rails'
5557
gem 'jazz_fingers'
56-
gem 'pry-rails'
5758
gem 'pry-byebug'
59+
gem 'pry-rails'
60+
gem 'rspec-rails'
5861
end
5962

6063
group :test do
6164
gem 'capybara'
6265
gem 'database_cleaner'
6366
gem 'launchy'
67+
gem 'rails-controller-testing'
6468
gem 'shoulda-matchers'
6569
gem 'timecop'
66-
gem 'rails-controller-testing'
6770
end
6871

6972
group :production do

‎Gemfile.lock

+18-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ GEM
4242
addressable (2.5.2)
4343
public_suffix (>= 2.0.2, < 4.0)
4444
arel (8.0.0)
45+
ast (2.3.0)
4546
awesome_print (1.8.0)
4647
babel-source (5.8.35)
4748
babel-transpiler (0.7.0)
@@ -395,10 +396,14 @@ GEM
395396
omniauth-twitter (1.4.0)
396397
omniauth-oauth (~> 1.1)
397398
rack
399+
parallel (1.12.0)
400+
parser (2.4.0.0)
401+
ast (~> 2.2)
398402
pebble_timeline (0.0.5)
399403
faraday
400404
roar
401405
pg (0.21.0)
406+
powerpack (0.1.1)
402407
pry (0.11.3)
403408
coderay (~> 1.1.0)
404409
method_source (~> 0.9.0)
@@ -477,6 +482,8 @@ GEM
477482
method_source
478483
rake (>= 0.8.7)
479484
thor (>= 0.18.1, < 2.0)
485+
rainbow (2.2.2)
486+
rake
480487
rake (12.3.0)
481488
rb-fsevent (0.10.2)
482489
rb-inotify (0.9.10)
@@ -521,6 +528,14 @@ GEM
521528
rspec-mocks (~> 3.7.0)
522529
rspec-support (~> 3.7.0)
523530
rspec-support (3.7.1)
531+
rubocop (0.50.0)
532+
parallel (~> 1.10)
533+
parser (>= 2.3.3.1, < 3.0)
534+
powerpack (~> 0.1)
535+
rainbow (>= 2.2.2, < 3.0)
536+
ruby-progressbar (~> 1.7)
537+
unicode-display_width (~> 1.0, >= 1.0.1)
538+
ruby-progressbar (1.8.3)
524539
ruby_dep (1.5.0)
525540
ruby_parser (3.11.0)
526541
sexp_processor (~> 4.9)
@@ -565,6 +580,7 @@ GEM
565580
unf (0.1.4)
566581
unf_ext
567582
unf_ext (0.0.7.5)
583+
unicode-display_width (1.3.0)
568584
unicode_utils (1.4.0)
569585
webpacker (3.2.2)
570586
activesupport (>= 4.2)
@@ -626,6 +642,7 @@ DEPENDENCIES
626642
react-rails
627643
redcarpet
628644
rspec-rails
645+
rubocop
629646
sass-rails
630647
sentry-raven
631648
shoulda-matchers
@@ -639,4 +656,4 @@ RUBY VERSION
639656
ruby 2.4.2p198
640657

641658
BUNDLED WITH
642-
2.0.2
659+
2.1.4

0 commit comments

Comments
 (0)
Please sign in to comment.