Skip to content

Commit 0a75a89

Browse files
committed
Remove select2-rails
* select2-rails is no longer supported, so we will vendor the files directly. * Bring in latest version of select2 (4.0.7) * Add vendor/bundle to .gitignore for convenience * Update db/schema for test db due to recent formatting changes in ActiveRecord
1 parent 3e47060 commit 0a75a89

File tree

8 files changed

+7109
-32
lines changed

8 files changed

+7109
-32
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ spec/dummy/public/system
1111
.gemtags
1212
.tags
1313
.tags_sorted_by_file
14+
vendor/bundle

Gemfile.lock

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ PATH
2424
require_all (~> 1.5)
2525
sassc
2626
sassc-rails
27-
select2-rails (~> 4.0)
2827
xdan-datetimepicker-rails (~> 2.5.1)
2928

3029
GEM
@@ -275,8 +274,6 @@ GEM
275274
sprockets (> 3.0)
276275
sprockets-rails
277276
tilt
278-
select2-rails (4.0.3)
279-
thor (~> 0.14)
280277
selenium-webdriver (3.142.7)
281278
childprocess (>= 0.5, < 4.0)
282279
rubyzip (>= 1.2.2)

activeadmin_addons.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
2323
s.add_dependency "require_all", "~> 1.5"
2424
s.add_dependency "sassc"
2525
s.add_dependency "sassc-rails"
26-
s.add_dependency "select2-rails", "~> 4.0"
2726
s.add_dependency "xdan-datetimepicker-rails", "~> 2.5.1"
2827

2928
s.add_development_dependency "aasm"

app/assets/javascripts/activeadmin_addons/all.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//= require select2-full
1+
//= require select2.full
22
//= require jquery.xdan.datetimepicker.full
33
//= require palette-color-picker
44
//

lib/activeadmin_addons/engine.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module ActiveAdminAddons
22
module Rails
33
class Engine < ::Rails::Engine
4-
require "select2-rails"
54
require 'sassc'
65
require 'sassc-rails'
76
require "xdan-datetimepicker-rails"

spec/dummy/db/schema.rb

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
ActiveRecord::Schema.define(version: 20180222225709) do
1515

1616
create_table "active_admin_comments", force: :cascade do |t|
17-
t.string "namespace", limit: 255
17+
t.string "namespace"
1818
t.text "body"
19-
t.string "resource_id", limit: 255, null: false
20-
t.string "resource_type", limit: 255, null: false
19+
t.string "resource_id", null: false
20+
t.string "resource_type", null: false
2121
t.integer "author_id"
22-
t.string "author_type", limit: 255
22+
t.string "author_type"
2323
t.datetime "created_at"
2424
t.datetime "updated_at"
2525
end
@@ -29,16 +29,16 @@
2929
add_index "active_admin_comments", ["resource_type", "resource_id"], name: "index_active_admin_comments_on_resource_type_and_resource_id"
3030

3131
create_table "admin_users", force: :cascade do |t|
32-
t.string "email", limit: 255, default: "", null: false
33-
t.string "encrypted_password", limit: 255, default: "", null: false
34-
t.string "reset_password_token", limit: 255
32+
t.string "email", default: "", null: false
33+
t.string "encrypted_password", default: "", null: false
34+
t.string "reset_password_token"
3535
t.datetime "reset_password_sent_at"
3636
t.datetime "remember_created_at"
37-
t.integer "sign_in_count", default: 0, null: false
37+
t.integer "sign_in_count", default: 0, null: false
3838
t.datetime "current_sign_in_at"
3939
t.datetime "last_sign_in_at"
40-
t.string "current_sign_in_ip", limit: 255
41-
t.string "last_sign_in_ip", limit: 255
40+
t.string "current_sign_in_ip"
41+
t.string "last_sign_in_ip"
4242
t.datetime "created_at"
4343
t.datetime "updated_at"
4444
end
@@ -47,20 +47,20 @@
4747
add_index "admin_users", ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true
4848

4949
create_table "cars", force: :cascade do |t|
50-
t.string "name", limit: 255
50+
t.string "name"
5151
t.integer "year"
5252
t.integer "manufacturer_id"
5353
end
5454

5555
create_table "categories", force: :cascade do |t|
56-
t.string "name", limit: 255
56+
t.string "name"
5757
t.text "description"
5858
t.datetime "created_at"
5959
t.datetime "updated_at"
6060
end
6161

6262
create_table "cities", force: :cascade do |t|
63-
t.string "name", limit: 255
63+
t.string "name"
6464
t.integer "region_id"
6565
t.datetime "created_at"
6666
t.datetime "updated_at"
@@ -70,36 +70,36 @@
7070
add_index "cities", ["region_id"], name: "index_cities_on_region_id"
7171

7272
create_table "countries", force: :cascade do |t|
73-
t.string "name", limit: 255
73+
t.string "name"
7474
t.datetime "created_at"
7575
t.datetime "updated_at"
7676
t.text "information"
7777
end
7878

7979
create_table "invoices", force: :cascade do |t|
8080
t.datetime "legal_date"
81-
t.string "number", limit: 255
81+
t.string "number"
8282
t.datetime "created_at"
8383
t.datetime "updated_at"
8484
t.boolean "paid"
85-
t.string "state", limit: 255
85+
t.string "state"
8686
t.integer "status"
87-
t.string "attachment_file_name", limit: 255
88-
t.string "attachment_content_type", limit: 255
87+
t.string "attachment_file_name"
88+
t.string "attachment_content_type"
8989
t.integer "attachment_file_size"
9090
t.datetime "attachment_updated_at"
91-
t.string "photo_file_name", limit: 255
92-
t.string "photo_content_type", limit: 255
91+
t.string "photo_file_name"
92+
t.string "photo_content_type"
9393
t.integer "photo_file_size"
9494
t.datetime "photo_updated_at"
9595
t.integer "category_id"
9696
t.integer "city_id"
9797
t.integer "position"
98-
t.string "color", limit: 255
98+
t.string "color"
9999
t.float "amount"
100100
t.integer "client_id"
101-
t.string "aasm_state", limit: 255
102-
t.boolean "active", default: true
101+
t.string "aasm_state"
102+
t.boolean "active", default: true
103103
t.string "shipping_status"
104104
end
105105

@@ -115,18 +115,18 @@
115115
add_index "invoices_items", ["item_id"], name: "index_invoices_items_on_item_id"
116116

117117
create_table "items", force: :cascade do |t|
118-
t.string "name", limit: 255
118+
t.string "name"
119119
t.text "description"
120120
t.datetime "created_at"
121121
t.datetime "updated_at"
122122
end
123123

124124
create_table "manufacturers", force: :cascade do |t|
125-
t.string "name", limit: 255
125+
t.string "name"
126126
end
127127

128128
create_table "regions", force: :cascade do |t|
129-
t.string "name", limit: 255
129+
t.string "name"
130130
t.integer "country_id"
131131
t.datetime "created_at"
132132
t.datetime "updated_at"

0 commit comments

Comments
 (0)