Skip to content

Commit c5921e3

Browse files
committed
use cells 4.1.7
See trailblazer/cells#448
1 parent efa899c commit c5921e3

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

Diff for: Gemfile

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ gem 'rails', '5.0.2'
66
gem 'trailblazer', '~> 2.0.1'
77
gem 'trailblazer-rails', '>= 1.0.0'
88

9-
# Using my own fork of cells which has a change to how Collection#join works.
10-
# My PR has been merged but not released, see https://github.com/trailblazer/cells/pull/448
11-
# Once it's released we can switch back to getting cells from Rubygems
12-
gem 'cells', github: 'georgemillo/cells', branch: 'collection-join'
9+
gem 'cells', '~> 4.1.7'
1310
gem 'cells-erb', '0.0.9'
1411

1512
gem 'acts_as_tree', '~> 2.4.0'

Diff for: Gemfile.lock

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
GIT
2-
remote: git://github.com/georgemillo/cells.git
3-
revision: e24cfc89a7f7260a7cb5a12ad2f9f5d95dbf2245
4-
branch: collection-join
5-
specs:
6-
cells (4.1.6)
7-
declarative-builder (< 0.2.0)
8-
declarative-option (< 0.2.0)
9-
tilt (>= 1.4, < 3)
10-
uber (< 0.2.0)
11-
121
GIT
132
remote: git://github.com/sinatra/sinatra.git
143
revision: 27d36fdad2104780b609aec8ac55f5fb8fa4ed18
@@ -100,6 +89,11 @@ GEM
10089
rack (>= 1.0.0)
10190
rack-test (>= 0.5.4)
10291
xpath (~> 2.0)
92+
cells (4.1.7)
93+
declarative-builder (< 0.2.0)
94+
declarative-option (< 0.2.0)
95+
tilt (>= 1.4, < 3)
96+
uber (< 0.2.0)
10397
cells-erb (0.0.9)
10498
cells (~> 4.0)
10599
erbse (>= 0.0.2, < 0.1.0)
@@ -484,7 +478,7 @@ DEPENDENCIES
484478
bullet (= 5.3.0)
485479
byebug
486480
capybara (= 2.7.1)
487-
cells!
481+
cells (~> 4.1.7)
488482
cells-erb (= 0.0.9)
489483
cells-rails
490484
database_cleaner

0 commit comments

Comments
 (0)