Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update gemfile & set asset file to use .js #596

Merged
merged 2 commits into from
May 18, 2022
Merged

Update gemfile & set asset file to use .js #596

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
18a1bd4
Update gemfile & set asset file to use .js
danigirl329 May 18, 2022
e901f9c
Merge branch 'master' into update-assets
danigirl329 May 18, 2022
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: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ group :development, :test do
gem 'mysql2'
gem 'poltergeist', '~> 1.18.1'
gem 'pry-byebug'
gem 'psych', '4.0.3'
gem 'rails-observers'
gem 'rspec-rails'
gem 'simplecov'
Expand Down
9 changes: 5 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
trusty-cms (5.2.1)
trusty-cms (5.2.2)
RedCloth (= 4.3.2)
activestorage-validator
acts_as_list (>= 0.9.5, < 1.1.0)
Expand Down Expand Up @@ -198,16 +198,16 @@ GEM
mime-types-data (3.2021.0225)
mini_magick (4.11.0)
mini_mime (1.1.2)
mini_portile2 (2.6.1)
mini_racer (0.6.2)
libv8-node (~> 16.10.0.0)
minitest (5.15.0)
multi_xml (0.6.0)
multipart-post (2.1.1)
mysql2 (0.5.3)
nio4r (2.5.8)
nokogiri (1.13.6-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.6-x86_64-linux)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
racc (~> 1.4)
orm_adapter (0.5.0)
poltergeist (1.18.1)
Expand Down Expand Up @@ -356,6 +356,7 @@ DEPENDENCIES
mysql2
poltergeist (~> 1.18.1)
pry-byebug
psych (= 4.0.3)
rails-observers
rspec-rails
simplecov
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//= require jquery-ui-bundle/jquery-ui
//= require js-cookie/dist/js.cookie
//= require 'jquery-validation/dist/jquery.validate.min'
//= require 'jquery-treetable/jquery.treetable'
//= require jquery-treetable/jquery.treetable.js
//= require_tree './admin/validations'
//= require ckeditor/init
//= require 'admin/persist.min'
Expand Down
2 changes: 1 addition & 1 deletion lib/trusty_cms.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

unless defined? TrustyCms::VERSION
module TrustyCms
VERSION = '5.2.1'.freeze
VERSION = '5.2.2'.freeze
end
end