chaltron 2.0.1 → 2.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 454c8be3dc2bbf14389881ba97cf37e75cd935ec85c781e486dfd5f0f94f4004
4
- data.tar.gz: c2d0332488f6a3841c838dc5c53d1dc2c627d0b6492b891b2558c7aa11979a00
3
+ metadata.gz: 8700e8508c5706107ed83e95b0fa16d77a058b9d1a805a2aadf87cfc80418c89
4
+ data.tar.gz: 133c5c06b49c9e3921d2dc445f0e58561f9d2572b6110d32df6f0da61ac3207c
5
5
  SHA512:
6
- metadata.gz: 74e2af3a7115738881e3248d7c56007ab5ab3781d343352fd7a0e7de721c67904c0cc489a7cea0ae4f5bd6a3596c1284db6d7beef26beaa77ed99e07efe87a27
7
- data.tar.gz: af16626a4dc0c050a2158f5df436bb7b7be3110e2ec849712fcfb6af4ce1889eee58ed2f1e9b6fca1a54e2079bef9b485bbdc94959c39a83e15edb1c4c146d91
6
+ metadata.gz: 439745e59c4d92da871850360988788569229b161e907072d9e650c16fc79ef5d4d7b07177ef92e88284289fdb39b4d8f3545c21fd7d779cc962d8030b6b22b0
7
+ data.tar.gz: ccd8ec77da779698847f1cc8814e905731910fa4d4fbf36fc706a8bf53ff92532278c171935425d440acea5937d50cd4d509edde9ff61df51b761e61d52cac3c
data/README.md CHANGED
@@ -1,7 +1,6 @@
1
1
  # Chaltron
2
2
 
3
3
  [![Gem Version](https://badge.fury.io/rb/chaltron.svg)](http://badge.fury.io/rb/chaltron) [![Build Status](https://travis-ci.org/vicvega/chaltron.svg?branch=master)](http://travis-ci.org/vicvega/chaltron)
4
- [![pipeline status](https://gitlab.com/vicvega/chaltron/badges/master/pipeline.svg)](https://gitlab.com/vicvega/chaltron/commits/master)
5
4
  [![Coverage Status](https://coveralls.io/repos/vicvega/chaltron/badge.svg?branch=master&service=github)](https://coveralls.io/github/vicvega/chaltron?branch=master)
6
5
  [![Code Climate](https://codeclimate.com/github/vicvega/chaltron/badges/gpa.svg)](https://codeclimate.com/github/vicvega/chaltron)
7
6
  [![security](https://hakiri.io/github/vicvega/chaltron/master.svg)](https://hakiri.io/github/vicvega/chaltron/master)
@@ -20,9 +20,6 @@ module Chaltron
20
20
  ActiveSupport.on_load(:action_controller) do
21
21
  include Chaltron::Controllers::Helpers
22
22
  before_action :configure_permitted_parameters, if: :devise_controller?
23
-
24
- # to override devise views
25
- prepend_view_path File.expand_path('../../../app/views', __FILE__)
26
23
  end
27
24
  end
28
25
 
@@ -1,3 +1,3 @@
1
1
  module Chaltron
2
- VERSION = '2.0.1'.freeze
2
+ VERSION = '2.0.2'.freeze
3
3
  end
@@ -22,7 +22,7 @@ module Chaltron
22
22
  gem 'gitlab_omniauth-ldap'
23
23
  gem 'cancancan'
24
24
 
25
- gem 'bootstrap'
25
+ gem 'bootstrap', '~> 4.6'
26
26
  gem 'autoprefixer-rails'
27
27
  gem 'font-awesome-sass'
28
28
 
@@ -36,6 +36,16 @@ module Chaltron
36
36
  gem 'rails-i18n'
37
37
  end
38
38
 
39
+ def gem_priority
40
+ # chaltron gem must be loaded after devise to setup the correct view paths
41
+ chaltron = File.readlines('Gemfile')
42
+ .select { |l| l.match('chaltron') }
43
+ .first
44
+
45
+ gsub_file 'Gemfile', chaltron, ''
46
+ append_file 'Gemfile', "\n#{chaltron}"
47
+ end
48
+
39
49
  def db_migrations
40
50
  rake 'chaltron_engine:install:migrations'
41
51
  end
@@ -126,10 +136,6 @@ JS
126
136
  copy_file 'app/models/ability.rb'
127
137
  end
128
138
 
129
- def setup_ajax_datatables
130
- copy_file 'config/initializers/ajax_datatables_rails.rb'
131
- end
132
-
133
139
  private
134
140
 
135
141
  def print_banner
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chaltron
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 2.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - vicvega
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-06-17 00:00:00.000000000 Z
11
+ date: 2021-07-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -269,7 +269,6 @@ files:
269
269
  - lib/generators/chaltron/templates/app/views/layouts/_footer.html.erb
270
270
  - lib/generators/chaltron/templates/app/views/layouts/_navbar.html.erb
271
271
  - lib/generators/chaltron/templates/app/views/layouts/application.html.erb
272
- - lib/generators/chaltron/templates/config/initializers/ajax_datatables_rails.rb
273
272
  - lib/generators/chaltron/templates/config/initializers/chaltron.rb
274
273
  - lib/generators/chaltron/templates/config/navigation.rb
275
274
  - lib/tasks/chaltron_tasks.rake
@@ -297,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
297
296
  - !ruby/object:Gem::Version
298
297
  version: '0'
299
298
  requirements: []
300
- rubygems_version: 3.0.3
299
+ rubygems_version: 3.1.6
301
300
  signing_key:
302
301
  specification_version: 4
303
302
  summary: Move faster and break things - revisited for rails 4
@@ -1,7 +0,0 @@
1
- AjaxDatatablesRails.configure do |config|
2
- # available options for db_adapter are: :pg, :mysql, :mysql2, :sqlite, :sqlite3
3
- # config.db_adapter = :pg
4
-
5
- # Or you can use your rails environment adapter if you want a generic dev and production
6
- config.db_adapter = Rails.configuration.database_configuration[Rails.env]['adapter'].to_sym
7
- end