Skip to content
This repository was archived by the owner on Dec 3, 2019. It is now read-only.

Uninstall gem 'forest_liana'/Forest Admin #327

Closed
kirbyfern wants to merge 2 commits into from
Closed

Uninstall gem 'forest_liana'/Forest Admin #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34830f4
Merge remote-tracking branch 'upstream/master'
kirbyfern Mar 25, 2018
47cad5d
uninstall Forest Admin via forest_liana gem
kirbyfern Apr 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ end
gem 'active_model_serializers'
gem 'acts-as-taggable-on', '~> 5.0'
gem 'devise'
gem 'forest_liana'
gem 'geocoder'
gem 'gibbon'
gem 'httparty'
Expand Down
17 changes: 0 additions & 17 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ GEM
airtable (0.0.9)
httparty
arel (7.1.4)
arel-helpers (2.6.1)
Copy link
Collaborator

@hpjaj hpjaj Apr 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try re-running make bundle to see if that resolves your gemfile.lock issues.

If not, try to rebase on master, then make bundle.

Copy link
Contributor Author

@kirbyfern kirbyfern Apr 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm it doesn't resolve the conflict issues let me just try to make another branch and do all the proper changes together

activerecord (>= 3.1.0, < 6)
awesome_print (1.8.0)
bcrypt (3.1.11)
builder (3.2.3)
Expand Down Expand Up @@ -80,30 +78,17 @@ GEM
faraday (0.12.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.9.18)
forest_liana (2.4.3)
arel-helpers
bcrypt
groupdate
jsonapi-serializers (>= 0.14.0)
jwt
rack-cors
rails (>= 4.0)
useragent
geocoder (1.4.3)
gibbon (3.0.1)
faraday (>= 0.9.1)
multi_json (>= 1.11.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
groupdate (4.0.0)
activesupport (>= 4.2)
hashdiff (0.3.7)
httparty (0.14.0)
multi_xml (>= 0.5.2)
i18n (0.8.1)
jsonapi-renderer (0.1.2)
jsonapi-serializers (1.0.0)
activesupport
jwt (1.5.6)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand Down Expand Up @@ -214,7 +199,6 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.3)
thread_safe (~> 0.1)
useragent (0.16.10)
vcr (3.0.3)
warden (1.2.7)
rack (>= 1.0)
Expand All @@ -237,7 +221,6 @@ DEPENDENCIES
devise
factory_girl_rails
faker
forest_liana
geocoder
gibbon
httparty
Expand Down
2 changes: 0 additions & 2 deletions config/initializers/forest_liana.rb
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Rails.application.routes.draw do

mount ForestLiana::Engine => '/forest'
devise_for :users

# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
Expand Down