Skip to content

Commit 9ab61a0

Browse files
committed
Update gems and ruby
1 parent bbafd65 commit 9ab61a0

File tree

3 files changed

+10
-23
lines changed

3 files changed

+10
-23
lines changed

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.1
1+
2.6.3

Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# rubocop:disable LineLength
22
source "https://rubygems.org"
3-
ruby "2.6.1"
3+
ruby "2.6.3"
44

55
# Enforce git to transmitted via https.
66
# workaround until bundler 2.0 is released.
@@ -16,7 +16,7 @@ end
1616
gem "actionpack-action_caching", "~> 1.2"
1717
gem "active_record_union", "~> 1.3"
1818
gem "acts-as-taggable-on", "~> 5.0"
19-
gem "acts_as_follower", github: "thepracticaldev/acts_as_follower", branch: "master"
19+
gem "acts_as_follower"
2020
gem "addressable", "~> 2.5", ">= 2.5.2"
2121
gem "administrate", "~> 0.11"
2222
gem "ahoy_email", "~> 0.5"
@@ -122,7 +122,7 @@ group :development, :test do
122122
gem "derailed", "~> 0.1"
123123
gem "erb_lint", "~> 0.0", require: false
124124
gem "faker", git: "https://github.com/stympy/faker.git", branch: "master"
125-
gem "fix-db-schema-conflicts", github: "thepracticaldev/fix-db-schema-conflicts", branch: "master"
125+
gem "fix-db-schema-conflicts"
126126
gem "memory_profiler", "~> 0.9"
127127
gem "parallel_tests", "~> 2.27"
128128
gem "pry-byebug", "~> 3.7"

Gemfile.lock

+6-19
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@ GIT
66
faker (1.9.1)
77
i18n (>= 0.7)
88

9-
GIT
10-
remote: https://github.com/thepracticaldev/acts_as_follower.git
11-
revision: 288690cd99bc470eaee493fce5bfa9fe23157692
12-
branch: master
13-
specs:
14-
acts_as_follower (0.2.1)
15-
activerecord (>= 4.0)
16-
17-
GIT
18-
remote: https://github.com/thepracticaldev/fix-db-schema-conflicts.git
19-
revision: 4172392392e1a8d907f7ab673cb5ddd9a4a31940
20-
branch: master
21-
specs:
22-
fix-db-schema-conflicts (3.0.2)
23-
rubocop (>= 0.38.0)
24-
259
GEM
2610
remote: https://rubygems.org/
2711
remote: https://rails-assets.org/
@@ -74,6 +58,7 @@ GEM
7458
tzinfo (~> 1.1)
7559
acts-as-taggable-on (5.0.0)
7660
activerecord (>= 4.2.8)
61+
acts_as_follower (0.2.1)
7762
addressable (2.5.2)
7863
public_suffix (>= 2.0.2, < 4.0)
7964
administrate (0.11.0)
@@ -322,6 +307,8 @@ GEM
322307
thor (~> 0.14)
323308
fission (0.5.0)
324309
CFPropertyList (~> 2.2)
310+
fix-db-schema-conflicts (3.1.0)
311+
rubocop (>= 0.38.0)
325312
fog (1.41.0)
326313
fog-aliyun (>= 0.1.0)
327314
fog-atmos
@@ -948,7 +935,7 @@ DEPENDENCIES
948935
actionpack-action_caching (~> 1.2)
949936
active_record_union (~> 1.3)
950937
acts-as-taggable-on (~> 5.0)
951-
acts_as_follower!
938+
acts_as_follower
952939
addressable (~> 2.5, >= 2.5.2)
953940
administrate (~> 0.11)
954941
ahoy_email (~> 0.5)
@@ -992,7 +979,7 @@ DEPENDENCIES
992979
fastly-rails (~> 0.8)
993980
feedjira (~> 2.2)
994981
figaro (~> 1.1)
995-
fix-db-schema-conflicts!
982+
fix-db-schema-conflicts
996983
fog (~> 1.41)
997984
front_matter_parser (~> 0.2)
998985
gemoji (~> 3.0.0)
@@ -1082,7 +1069,7 @@ DEPENDENCIES
10821069
zonebie (~> 0.6.1)
10831070

10841071
RUBY VERSION
1085-
ruby 2.6.1p33
1072+
ruby 2.6.3p62
10861073

10871074
BUNDLED WITH
10881075
1.17.3

0 commit comments

Comments
 (0)