diff --git a/Gemfile b/Gemfile index 312eb70..5764981 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,4 @@ source "https://rubygems.org" -git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.0.4" @@ -18,7 +17,8 @@ gem 'haml-rails' # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] # gem "image_processing", "~> 1.2" -gem "merged" , path: 'merged' +gem "merged" , git: "https://github.com/HubFeenixMakers/merged" +#gem "merged" , path: "../merged" group :production do gem "passenger" diff --git a/Gemfile.lock b/Gemfile.lock index f154eef..86495e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,6 @@ -PATH - remote: merged +GIT + remote: https://github.com/HubFeenixMakers/merged + revision: dbcb6549907109c973cb6828b46d81e4db8b865e specs: merged (0.1.0) git diff --git a/app/assets/images/cms/retreats.jpg b/app/assets/images/cms/retreats.jpg index b937993..603d5f4 100644 Binary files a/app/assets/images/cms/retreats.jpg and b/app/assets/images/cms/retreats.jpg differ