diff --git a/Gemfile b/Gemfile index b76c43a61..56878034f 100644 --- a/Gemfile +++ b/Gemfile @@ -80,7 +80,7 @@ gem 'bootstrap', '~> 4.0' gem 'popper_js' gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript' gem 'geoblacklight', '~> 4.1' -gem 'geoblacklight_admin', git: "https://github.com/geobtaa/geoblacklight_admin.git", branch: "feature/#22-queue-priorities" +gem 'geoblacklight_admin', '~> 0.3' gem "rubyzip", ">= 1.3.0" gem "awesome_print" diff --git a/Gemfile.lock b/Gemfile.lock index 6ed6fa702..84547000a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,42 +39,6 @@ GIT rails (>= 5.2, < 7.1) statesman (~> 10.0.0) -GIT - remote: https://github.com/geobtaa/geoblacklight_admin.git - revision: 11e2af5cb545484cf9db3107a929b75bb3589d49 - branch: feature/#22-queue-priorities - specs: - geoblacklight_admin (0.3.0) - active_storage_validations (~> 1.0) - amazing_print - blacklight (~> 7.33) - blacklight_advanced_search - blacklight_range_limit - bootstrap (~> 4.0) - chosen-rails (~> 1.10) - cocoon (~> 1.2) - config (~> 4.0) - devise (~> 4.7) - devise-bootstrap-views (~> 1.0) - devise_invitable (~> 2.0) - dotenv-rails (~> 2.8) - geoblacklight (~> 4.0) - haml (~> 5.2) - httparty (~> 0.21) - inline_svg (~> 1.9) - jquery-rails (~> 4.4) - kithe (~> 2.0) - noticed (~> 1.6) - pagy (~> 6.0) - paper_trail (~> 14.0) - pg (~> 1.4) - qa (~> 5.0) - rails (>= 6.1, < 7.1) - ruby-progressbar - simple_form (~> 5.0) - sprockets (< 4) - statesman (~> 10.0) - GEM remote: https://rubygems.org/ specs: @@ -364,6 +328,36 @@ GEM mime-types rails (>= 6.1, < 7.1) rgeo-geojson + geoblacklight_admin (0.3.1) + active_storage_validations (~> 1.0) + amazing_print + blacklight (~> 7.33) + blacklight_advanced_search + blacklight_range_limit + bootstrap (~> 4.0) + chosen-rails (~> 1.10) + cocoon (~> 1.2) + config (~> 4.0) + devise (~> 4.7) + devise-bootstrap-views (~> 1.0) + devise_invitable (~> 2.0) + dotenv-rails (~> 2.8) + geoblacklight (~> 4.0) + haml (~> 5.2) + httparty (~> 0.21) + inline_svg (~> 1.9) + jquery-rails (~> 4.4) + kithe (~> 2.0) + noticed (~> 1.6) + pagy (~> 6.0) + paper_trail (~> 14.0) + pg (~> 1.4) + qa (~> 5.0) + rails (>= 6.1, < 7.1) + ruby-progressbar + simple_form (~> 5.0) + sprockets (< 4) + statesman (~> 10.0) geocoder (1.8.2) git (1.11.0) rchardet (~> 1.8) @@ -695,7 +689,7 @@ GEM temple (0.10.3) tether-rails (1.4.0) rails (>= 3.1) - thor (1.2.2) + thor (1.3.0) thread_safe (0.3.6) tilt (2.3.0) timeout (0.4.0) @@ -797,7 +791,7 @@ DEPENDENCIES foreman geoblacklight (~> 4.1) geoblacklight-icons! - geoblacklight_admin! + geoblacklight_admin (~> 0.3) geoblacklight_sidecar_images! haml handlebars_assets (~> 0.23.0)