activeadmin 1.0.0.pre5 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of activeadmin might be problematic. Click here for more details.

Files changed (155) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +27 -0
  3. data/.travis.yml +21 -23
  4. data/Appraisals +12 -74
  5. data/CHANGELOG.md +21 -5
  6. data/CONTRIBUTING.md +2 -2
  7. data/Gemfile +8 -9
  8. data/README.md +19 -56
  9. data/Rakefile +1 -1
  10. data/activeadmin.gemspec +4 -4
  11. data/app/assets/stylesheets/active_admin/_forms.scss +10 -0
  12. data/config/locales/ca.yml +1 -1
  13. data/config/locales/da.yml +44 -12
  14. data/config/locales/el.yml +1 -1
  15. data/config/locales/en.yml +2 -0
  16. data/config/locales/fr.yml +16 -2
  17. data/config/locales/ja.yml +1 -0
  18. data/config/locales/zh-CN.yml +4 -0
  19. data/docs/12-arbre-components.md +23 -0
  20. data/docs/14-gotchas.md +1 -1
  21. data/docs/2-resource-customization.md +2 -5
  22. data/docs/5-forms.md +19 -0
  23. data/docs/6-show-pages.md +0 -28
  24. data/docs/9-batch-actions.md +0 -1
  25. data/docs/CNAME +1 -1
  26. data/docs/_includes/head.html +4 -4
  27. data/docs/_includes/toc.html +2 -1
  28. data/docs/documentation.md +2 -2
  29. data/docs/index.html +1 -6
  30. data/docs/stylesheets/main.css +172 -219
  31. data/features/belongs_to.feature +5 -5
  32. data/features/comments/commenting.feature +0 -13
  33. data/features/create_another.feature +55 -0
  34. data/features/development_reloading.feature +2 -4
  35. data/features/edit_page.feature +6 -7
  36. data/features/favicon.feature +2 -2
  37. data/features/i18n.feature +1 -0
  38. data/features/index/filters.feature +18 -0
  39. data/features/index/format_as_csv.feature +3 -3
  40. data/features/index/formats.feature +22 -0
  41. data/features/index/index_as_table.feature +6 -6
  42. data/features/index/page_title.feature +1 -2
  43. data/features/menu.feature +20 -1
  44. data/features/new_page.feature +6 -8
  45. data/features/registering_assets.feature +4 -4
  46. data/features/registering_pages.feature +18 -0
  47. data/features/renamed_resource.feature +2 -4
  48. data/features/show/page_title.feature +1 -2
  49. data/features/step_definitions/attribute_steps.rb +1 -1
  50. data/features/step_definitions/configuration_steps.rb +2 -2
  51. data/features/step_definitions/format_steps.rb +4 -0
  52. data/features/step_definitions/index_scope_steps.rb +1 -1
  53. data/features/step_definitions/menu_steps.rb +2 -2
  54. data/features/step_definitions/user_steps.rb +1 -1
  55. data/features/step_definitions/web_steps.rb +6 -5
  56. data/features/sti_resource.feature +2 -2
  57. data/features/strong_parameters.feature +0 -4
  58. data/features/support/env.rb +5 -19
  59. data/features/support/paths.rb +6 -9
  60. data/gemfiles/rails_42.gemfile +15 -23
  61. data/gemfiles/rails_50.gemfile +15 -16
  62. data/gemfiles/rails_51.gemfile +45 -0
  63. data/lib/active_admin/application.rb +4 -0
  64. data/lib/active_admin/base_controller.rb +2 -7
  65. data/lib/active_admin/base_controller/menu.rb +1 -5
  66. data/lib/active_admin/csv_builder.rb +2 -2
  67. data/lib/active_admin/dependency.rb +4 -8
  68. data/lib/active_admin/devise.rb +1 -1
  69. data/lib/active_admin/error.rb +1 -1
  70. data/lib/active_admin/filters/active.rb +2 -10
  71. data/lib/active_admin/filters/resource_extension.rb +1 -10
  72. data/lib/active_admin/inputs/filters/date_range_input.rb +1 -1
  73. data/lib/active_admin/inputs/filters/select_input.rb +1 -2
  74. data/lib/active_admin/inputs/filters/text_input.rb +2 -2
  75. data/lib/active_admin/menu.rb +1 -1
  76. data/lib/active_admin/namespace.rb +14 -7
  77. data/lib/active_admin/orm/active_record/comments.rb +2 -7
  78. data/lib/active_admin/orm/active_record/comments/comment.rb +2 -12
  79. data/lib/active_admin/page.rb +5 -0
  80. data/lib/active_admin/page_controller.rb +1 -5
  81. data/lib/active_admin/resource.rb +28 -5
  82. data/lib/active_admin/resource/attributes.rb +44 -0
  83. data/lib/active_admin/resource/menu.rb +4 -1
  84. data/lib/active_admin/resource/routes.rb +2 -3
  85. data/lib/active_admin/resource_controller.rb +13 -0
  86. data/lib/active_admin/resource_controller/data_access.rb +18 -9
  87. data/lib/active_admin/resource_dsl.rb +21 -18
  88. data/lib/active_admin/version.rb +1 -1
  89. data/lib/active_admin/view_helpers/breadcrumb_helper.rb +1 -1
  90. data/lib/active_admin/view_helpers/display_helper.rb +10 -12
  91. data/lib/active_admin/view_helpers/download_format_links_helper.rb +12 -0
  92. data/lib/active_admin/view_helpers/fields_for.rb +1 -2
  93. data/lib/active_admin/view_helpers/form_helper.rb +1 -1
  94. data/lib/active_admin/views/components/active_admin_form.rb +28 -2
  95. data/lib/active_admin/views/components/paginated_collection.rb +3 -8
  96. data/lib/active_admin/views/components/table_for.rb +1 -1
  97. data/lib/active_admin/views/index_as_table.rb +2 -2
  98. data/lib/active_admin/views/pages/layout.rb +1 -1
  99. data/lib/active_admin/views/pages/show.rb +1 -1
  100. data/lib/bug_report_templates/rails_5_master.rb +1 -3
  101. data/lib/generators/active_admin/devise/devise_generator.rb +1 -1
  102. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +7 -0
  103. data/lib/generators/active_admin/install/templates/admin_user.rb.erb +0 -2
  104. data/lib/generators/active_admin/install/templates/migrations/create_active_admin_comments.rb.erb +5 -7
  105. data/lib/generators/active_admin/resource/resource_generator.rb +1 -1
  106. data/lib/generators/active_admin/resource/templates/{admin.rb → admin.rb.erb} +0 -2
  107. data/lib/ransack_ext.rb +2 -2
  108. data/spec/rails_helper.rb +1 -19
  109. data/spec/requests/default_namespace_spec.rb +40 -8
  110. data/spec/support/active_admin_integration_spec_helper.rb +9 -2
  111. data/spec/support/rails_template.rb +17 -20
  112. data/spec/support/rails_template_with_data.rb +3 -9
  113. data/spec/support/templates/admin/stores.rb +1 -3
  114. data/spec/unit/application_spec.rb +19 -8
  115. data/spec/unit/belongs_to_spec.rb +6 -2
  116. data/spec/unit/comments_spec.rb +0 -19
  117. data/spec/unit/controller_filters_spec.rb +5 -5
  118. data/spec/unit/csv_builder_spec.rb +7 -4
  119. data/spec/unit/filters/active_spec.rb +1 -8
  120. data/spec/unit/filters/filter_form_builder_spec.rb +2 -3
  121. data/spec/unit/filters/resource_spec.rb +3 -4
  122. data/spec/unit/form_builder_spec.rb +39 -11
  123. data/spec/unit/namespace/register_page_spec.rb +1 -1
  124. data/spec/unit/pretty_format_spec.rb +39 -35
  125. data/spec/unit/resource/attributes_spec.rb +50 -0
  126. data/spec/unit/resource/includes_spec.rb +1 -1
  127. data/spec/unit/resource/ordering_spec.rb +1 -1
  128. data/spec/unit/resource/routes_spec.rb +2 -2
  129. data/spec/unit/resource_controller/data_access_spec.rb +51 -10
  130. data/spec/unit/resource_controller/decorators_spec.rb +2 -2
  131. data/spec/unit/resource_controller/sidebars_spec.rb +3 -3
  132. data/spec/unit/resource_controller_spec.rb +16 -5
  133. data/spec/unit/resource_spec.rb +12 -38
  134. data/spec/unit/routing_spec.rb +2 -2
  135. data/spec/unit/view_helpers/breadcrumbs_spec.rb +36 -1
  136. data/spec/unit/view_helpers/display_helper_spec.rb +17 -2
  137. data/spec/unit/view_helpers/fields_for_spec.rb +1 -1
  138. data/spec/unit/view_helpers/form_helper_spec.rb +3 -3
  139. data/spec/unit/view_helpers/method_or_proc_helper_spec.rb +2 -2
  140. data/spec/unit/views/components/attributes_table_spec.rb +2 -2
  141. data/spec/unit/views/components/index_list_spec.rb +1 -1
  142. data/spec/unit/views/components/paginated_collection_spec.rb +4 -4
  143. data/spec/unit/views/components/table_for_spec.rb +1 -1
  144. data/spec/unit/views/components/unsupported_browser_spec.rb +1 -1
  145. data/spec/unit/views/pages/form_spec.rb +4 -1
  146. data/spec/unit/views/pages/index_spec.rb +1 -1
  147. data/spec/unit/views/pages/show_spec.rb +2 -3
  148. data/tasks/lint.rake +8 -0
  149. metadata +22 -29
  150. data/features/step_definitions/symbol_leak_steps.rb +0 -3
  151. data/features/symbol_leak.feature +0 -35
  152. data/gemfiles/rails_32.gemfile +0 -54
  153. data/gemfiles/rails_40.gemfile +0 -53
  154. data/gemfiles/rails_41.gemfile +0 -53
  155. data/spec/support/deferred_garbage_collection.rb +0 -19
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 981348a279011a3812ddeb69db1213f2ff454b8e
4
- data.tar.gz: b67a141f87026c494e0e76584d5abd973546dd2a
3
+ metadata.gz: 5ad68985cf893a7bfc01a87ca8d4e9941beeb44c
4
+ data.tar.gz: 741933e1ad50389a45df1b376d8288dfdd5eec81
5
5
  SHA512:
6
- metadata.gz: 8e3662795d0ff12f6ea668f98163eb2ee596223e0f77dbc1291e42eaba43632e49e922cfb99ed3f7f6f44af372b35897325fdbcfb6912460b427cd45dcbe4564
7
- data.tar.gz: 0e960135e5e217c886a3c7c262175bcc2ec3a47141fb611cb16360313db1aaf3803ebe79cdb82f52ca6598bd3d2e616b5338a901d2500bee629c0d96cc4f2714
6
+ metadata.gz: c3f01d37b8a53e5953e72d0d411789a05f47a4347fd05f42cbb02c911d4d03b7917bc05dddbc1772eff6b2985584387bc655b53a69a39b61e09803be69d185ed
7
+ data.tar.gz: 8d62234059cc7662c37c79fd18cc6b59dc3e39ee4602d95cc16d21f1737cbfbd1fb40707a1fdfde3e58028ef10974f80e3bb02a80ac4795be894f0254fcb49a9
@@ -0,0 +1,27 @@
1
+ ---
2
+
3
+ AllCops:
4
+ DisabledByDefault: true
5
+
6
+ Exclude:
7
+ - spec/rails/**/*
8
+ - gemfiles/vendor/bundle/**/*
9
+
10
+ Include:
11
+ - "**/*.rake"
12
+ - "**/Gemfile"
13
+ - "gemfiles/*.gemfile"
14
+ - "**/Rakefile"
15
+
16
+ DisplayCopNames: true
17
+
18
+ StyleGuideCopsOnly: false
19
+
20
+ Style/HashSyntax:
21
+ Enabled: true
22
+
23
+ Style/TrailingWhitespace:
24
+ Enabled: true
25
+
26
+ Style/SpaceAfterComma:
27
+ Enabled: true
@@ -6,6 +6,10 @@ sudo: false
6
6
 
7
7
  bundler_args: --without development
8
8
 
9
+ branches:
10
+ only:
11
+ - master
12
+
9
13
  cache: bundler
10
14
 
11
15
  before_install:
@@ -13,47 +17,41 @@ before_install:
13
17
  - if [ $(phantomjs --version) != '2.1.1' ]; then npm install phantomjs-prebuilt@2.1; fi
14
18
  - gem update --system # use the very latest Rubygems
15
19
  - rvm @global do gem uninstall bundler -a -x
16
- - rvm @global do gem install bundler -v 1.14.3 # latest version known to work
17
-
18
- before_script:
19
- - bundle exec rake setup
20
+ - rvm @global do gem install bundler -v 1.14.6 # latest version known to work
20
21
 
21
22
  script:
22
- - bundle exec rake test
23
+ - bundle exec rake
23
24
 
24
25
  rvm:
25
- - jruby-9.1.7.0
26
- - 1.9.3
27
- - 2.2.6
28
- - 2.3.3
29
- - 2.4.0
26
+ - jruby-9.1.8.0
27
+ - 2.1.10
28
+ - 2.2.7
29
+ - 2.3.4
30
+ - 2.4.1
30
31
 
31
32
  gemfile:
32
- - gemfiles/rails_32.gemfile
33
- - gemfiles/rails_40.gemfile
34
- - gemfiles/rails_41.gemfile
35
33
  - gemfiles/rails_42.gemfile
36
34
  - gemfiles/rails_50.gemfile
35
+ - gemfiles/rails_51.gemfile
37
36
 
38
37
  env:
39
38
  global:
40
- - JRUBY_OPTS="-J-Xmx1024m --debug"
39
+ - JRUBY_OPTS="-J-Xmx1024m --dev --debug"
41
40
 
42
41
  matrix:
43
42
  fast_finish: true
44
43
 
45
44
  exclude:
46
- - rvm: 1.9.3
45
+ - rvm: 2.1.10
47
46
  gemfile: gemfiles/rails_50.gemfile
47
+ - rvm: 2.1.10
48
+ gemfile: gemfiles/rails_51.gemfile
48
49
 
49
- - rvm: 2.4.0
50
- gemfile: gemfiles/rails_32.gemfile
51
-
52
- - rvm: 2.4.0
53
- gemfile: gemfiles/rails_40.gemfile
54
-
55
- - rvm: 2.4.0
56
- gemfile: gemfiles/rails_41.gemfile
50
+ allow_failures:
51
+ - rvm: jruby-9.1.8.0
52
+ gemfile: gemfiles/rails_50.gemfile
53
+ - rvm: jruby-9.1.8.0
54
+ gemfile: gemfiles/rails_51.gemfile
57
55
 
58
56
  notifications:
59
57
  irc:
data/Appraisals CHANGED
@@ -1,99 +1,37 @@
1
- appraise 'rails_32' do
2
- gemspec
3
-
4
- gem 'rails', '3.2.22'
5
- gem 'jquery-ui-rails', '~> 4.0'
6
- gem 'devise', '~> 3.5'
7
-
8
- gem 'inherited_resources'
9
-
10
- gem 'test-unit', '~> 3.0'
11
-
12
- gem 'draper', '~> 2.1'
13
-
14
- platforms :ruby_19 do # Remove this block when we drop support for Ruby 1.9
15
- gem 'kaminari', '~> 0.15'
16
- gem 'mime-types', '< 3'
17
- gem 'nokogiri', '< 1.7'
18
- gem 'public_suffix', '< 1.5'
19
- end
20
-
21
- gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
22
- end
23
-
24
- appraise 'rails_40' do
25
- gemspec
26
-
27
- gem 'rails', '4.0.13'
28
- gem 'jquery-ui-rails', '~> 5.0'
29
- gem 'devise', '~> 3.5'
30
-
31
- gem 'inherited_resources'
32
-
33
- gem 'draper', '~> 2.1'
34
-
35
- platforms :ruby_19 do # Remove this block when we drop support for Ruby 1.9
36
- gem 'kaminari', '~> 0.15'
37
- gem 'mime-types', '< 3'
38
- gem 'nokogiri', '< 1.7'
39
- gem 'public_suffix', '< 1.5'
40
- end
41
-
42
- gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
43
- end
44
-
45
- appraise 'rails_41' do
1
+ appraise 'rails_42' do
46
2
  gemspec
47
3
 
48
- gem 'rails', '4.1.16'
4
+ gem 'rails', '4.2.8'
49
5
  gem 'jquery-ui-rails', '~> 5.0'
50
6
  gem 'devise', '~> 3.5'
51
7
 
52
- gem 'inherited_resources'
53
-
54
8
  gem 'draper', '~> 2.1'
55
9
 
56
- platforms :ruby_19 do # Remove this block when we drop support for Ruby 1.9
57
- gem 'kaminari', '~> 0.15'
58
- gem 'mime-types', '< 3'
59
- gem 'nokogiri', '< 1.7'
60
- gem 'public_suffix', '< 1.5'
61
- end
62
-
63
10
  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
64
11
  end
65
12
 
66
- appraise 'rails_42' do
13
+ appraise 'rails_50' do
67
14
  gemspec
68
15
 
69
- gem 'rails', '4.2.8.rc1'
16
+ gem 'rails', '5.0.2'
70
17
  gem 'jquery-ui-rails', '~> 5.0'
71
- gem 'devise', '~> 3.5'
72
-
73
- gem 'inherited_resources'
74
-
75
- gem 'draper', '~> 2.1'
18
+ gem 'devise', '> 4.x'
76
19
 
77
- platforms :ruby_19 do # Remove this block when we drop support for Ruby 1.9
78
- gem 'kaminari', '~> 0.15'
79
- gem 'mime-types', '< 3'
80
- gem 'nokogiri', '< 1.7'
81
- gem 'public_suffix', '< 1.5'
82
- end
20
+ gem 'draper', '> 3.x'
83
21
 
84
- gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
22
+ gem 'activerecord-jdbcsqlite3-adapter',
23
+ git: 'https://github.com/jruby/activerecord-jdbc-adapter',
24
+ branch: 'rails-5',
25
+ platforms: :jruby
85
26
  end
86
27
 
87
- appraise 'rails_50' do
28
+ appraise 'rails_51' do
88
29
  gemspec
89
30
 
90
- gem 'rails', '5.0.1'
31
+ gem 'rails', '~> 5.1.x'
91
32
  gem 'jquery-ui-rails', '~> 5.0'
92
33
  gem 'devise', '> 4.x'
93
34
 
94
- # Note: when updating this list, be sure to also update the README
95
- gem 'inherited_resources', git: 'https://github.com/activeadmin/inherited_resources'
96
-
97
35
  gem 'draper', '> 3.x'
98
36
 
99
37
  gem 'activerecord-jdbcsqlite3-adapter',
@@ -1,5 +1,5 @@
1
1
  # Changelog
2
- ## 1.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v0.6.3...master) (unreleased)
2
+ ## 1.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v0.6.3...master)
3
3
 
4
4
  ### Breaking Changes
5
5
 
@@ -8,6 +8,9 @@
8
8
  * `f.form_buffers` has been removed [#3486][] by [@varyonic][]
9
9
  * Iconic has been removed [#3553][] by [@timoschilling][]
10
10
  * `config.show_comments_in_menu` has been removed, see `config.comments_menu` [#4187][] by [@drn][]
11
+ * Rails 3.2 & Ruby 1.9.3 support has been dropped [#4848][] [@deivid-rodriguez][]
12
+ * Ruby 2.0.0 support has been dropped [#4851][] [@deivid-rodriguez][]
13
+ * Rails 4.0 & 4.1 support has been dropped [#4855][] [@deivid-rodriguez][]
11
14
 
12
15
  ### Enhancements
13
16
 
@@ -16,9 +19,12 @@
16
19
  * Migration from Metasearch to Ransack [#1979][] by [@seanlinsley][]
17
20
  * Rails 4 support [#2326][] by many people <3
18
21
  * Rails 4.2 support [#3731][] by [@gonzedge][] and [@timoschilling][]
22
+ * Rails 5 support [#4254][] by [@seanlinsley][]
23
+ * Rails 5.1 support [#4882][] by [@varyonic][]
19
24
 
20
25
  #### Minor
21
26
 
27
+ * "Create another" checkbox for the new resource page. [#4477][] by [@bolshakov][]
22
28
  * Page supports belongs_to [#4759][] by [@Fivell][] and [@zorab47][]
23
29
  * Support for custom sorting strategies [#4768][] by [@Fivell][]
24
30
  * Stream CSV downloads as they're generated [#3038][] by [@craigmcnamara][]
@@ -53,6 +59,7 @@ index download_links: ->{ can?(:view_all_download_links) || [:pdf] }
53
59
 
54
60
  ### Security Fixes
55
61
 
62
+ * Prevents access to formats that the user not permitted to see [#4867][] by [@Fivell][] and [@timoschilling][]
56
63
  * Prevents potential DOS attack via Ruby symbols [#1926][] by [@seanlinsley][]
57
64
  * [this isn't an issue for those using Ruby >= 2.2](http://rubykaigi.org/2014/presentation/S-NarihiroNakamura)
58
65
 
@@ -106,21 +113,30 @@ Please check [0-6-stable](https://github.com/activeadmin/activeadmin/blob/0-6-st
106
113
  [#3731]: https://github.com/activeadmin/activeadmin/issues/3731
107
114
  [#3783]: https://github.com/activeadmin/activeadmin/issues/3783
108
115
  [#4187]: https://github.com/activeadmin/activeadmin/issues/4187
116
+ [#4254]: https://github.com/activeadmin/activeadmin/issues/4254
117
+ [#4477]: https://github.com/activeadmin/activeadmin/pull/4477
109
118
  [#4759]: https://github.com/activeadmin/activeadmin/pull/4759
110
119
  [#4768]: https://github.com/activeadmin/activeadmin/pull/4768
111
- [@PChambino]: https://github.com/PChambino
112
- [@TimPetricola]: https://github.com/TimPetricola
120
+ [#4848]: https://github.com/activeadmin/activeadmin/pull/4848
121
+ [#4851]: https://github.com/activeadmin/activeadmin/pull/4851
122
+ [#4867]: https://github.com/activeadmin/activeadmin/pull/4867
123
+ [#4882]: https://github.com/activeadmin/activeadmin/pull/4882
124
+
125
+ [@bolshakov]: https://github.com/bolshakov
113
126
  [@chancancode]: https://github.com/chancancode
114
127
  [@craigmcnamara]: https://github.com/craigmcnamara
115
- [@drn]: https://github.com/drn
128
+ [@deivid-rodriguez]: https://github.com/deivid-rodriguez
116
129
  [@dmitry]: https://github.com/dmitry
130
+ [@drn]: https://github.com/drn
131
+ [@Fivell]: https://github.com/Fivell
117
132
  [@gonzedge]: https://github.com/gonzedge
118
133
  [@johnnyshields]: https://github.com/johnnyshields
134
+ [@PChambino]: https://github.com/PChambino
119
135
  [@potatosalad]: https://github.com/potatosalad
120
136
  [@pranas]: https://github.com/pranas
121
137
  [@seanlinsley]: https://github.com/seanlinsley
122
138
  [@shekibobo]: https://github.com/shekibobo
123
139
  [@timoschilling]: https://github.com/timoschilling
140
+ [@TimPetricola]: https://github.com/TimPetricola
124
141
  [@varyonic]: https://github.com/varyonic
125
142
  [@zorab47]: https://github.com/zorab47
126
- [@Fivell]: https://github.com/Fivell
@@ -63,7 +63,7 @@ or even just run specific tests. For example:
63
63
  bundle exec appraisal rails_42 rspec spec/unit/belongs_to_spec.rb
64
64
  ```
65
65
 
66
- The test run will generate a sample rails application in `spec/rails` to run the
66
+ The test run will generate a sample Rails application in `spec/rails` to run the
67
67
  tests against.
68
68
 
69
69
  If your tests are passing locally but they're failing on Travis, reset your test
@@ -131,7 +131,7 @@ Or to migrate the database:
131
131
  bundle exec rake local db:migrate
132
132
  ```
133
133
 
134
- ### 7. Run tests against major supported rails versions
134
+ ### 7. Run tests against major supported Rails versions
135
135
 
136
136
  Once you've implemented your code, got the tests passing, previewed it in a
137
137
  browser, you're ready to test it against multiple versions of Rails.
data/Gemfile CHANGED
@@ -4,22 +4,21 @@ source 'https://rubygems.org'
4
4
  gem 'cancan'
5
5
  gem 'pundit'
6
6
 
7
- # Until https://github.com/erikhuda/thor/issues/538 fixed
8
- gem 'thor', '<= 0.19.1'
9
-
10
7
  # Utility gems used in both development & test environments
11
8
  gem 'rake'
12
- gem 'parallel_tests', '< 2.10' #2.10 requires ruby '>= 2.0.0'
9
+ gem 'parallel_tests'
13
10
 
14
11
  # Debugging
15
12
  gem 'pry' # Easily debug from your console with `binding.pry`
16
13
 
14
+ # Code style
15
+ gem 'rubocop', '0.48.1'
16
+
17
17
  group :development do
18
18
  # Debugging
19
- gem 'better_errors', # Web UI to debug exceptions. Go to /__better_errors to access the latest one
20
- platforms: [:ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24]
19
+ gem 'better_errors' # Web UI to debug exceptions. Go to /__better_errors to access the latest one
21
20
 
22
- gem 'binding_of_caller', platforms: :mri # Retrieve the binding of a method's caller in MRI Ruby >= 1.9.2
21
+ gem 'binding_of_caller', platforms: :mri # Retrieve the binding of a method's caller
23
22
 
24
23
  # Performance
25
24
  gem 'rack-mini-profiler' # Inline app profiler. See ?pp=help for options.
@@ -28,7 +27,7 @@ group :development do
28
27
  gem 'yard' # Documentation generator
29
28
  gem 'redcarpet', platforms: :mri # Markdown implementation (for yard)
30
29
  gem 'kramdown', platforms: :jruby # Markdown implementation (for yard)
31
- gem 'appraisal', require: false
30
+ gem 'appraisal', '~> 2.2', require: false
32
31
  end
33
32
 
34
33
  group :test do
@@ -37,7 +36,7 @@ group :test do
37
36
  gem 'codecov', require: false # Test coverage website. Go to https://codecov.io
38
37
  gem 'cucumber-rails', require: false
39
38
  gem 'cucumber', '1.3.20'
40
- gem 'database_cleaner'
39
+ gem 'database_cleaner', git: 'https://github.com/DatabaseCleaner/database_cleaner.git'
41
40
  gem 'jasmine'
42
41
  gem 'jslint_on_rails'
43
42
  gem 'launchy'
data/README.md CHANGED
@@ -1,62 +1,13 @@
1
1
  # Active Admin
2
2
 
3
- Active Admin is a Ruby on Rails framework for creating elegant backends for website administration.
3
+ [Active Admin](https://www.activeadmin.info) is a Ruby on Rails framework for creating elegant backends for website administration.
4
4
 
5
5
  [![Version ](http://img.shields.io/gem/v/activeadmin.svg) ](https://rubygems.org/gems/activeadmin)
6
6
  [![Travis CI ](http://img.shields.io/travis/activeadmin/activeadmin/master.svg) ](https://travis-ci.org/activeadmin/activeadmin)
7
7
  [![Quality ](http://img.shields.io/codeclimate/github/activeadmin/activeadmin.svg) ](https://codeclimate.com/github/activeadmin/activeadmin)
8
8
  [![Coverage ](https://codecov.io/gh/activeadmin/activeadmin/branch/master/graph/badge.svg)](https://codecov.io/gh/activeadmin/activeadmin)
9
9
  [![Inch CI ](http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master) ](http://inch-ci.org/github/activeadmin/activeadmin)
10
-
11
- ## State of the project
12
-
13
- ### 1.0.0
14
-
15
- We're [currently working on 1.0.0](https://github.com/activeadmin/activeadmin/issues?milestone=18),
16
- which as far as dependencies, moves us from meta_search to Ransack and adds Rails 4 & 5 support.
17
-
18
- You can get it by tracking master:
19
- ```ruby
20
- gem 'activeadmin', git: 'https://github.com/activeadmin/activeadmin'
21
- ```
22
-
23
- Or you can using rubygems:
24
- ```ruby
25
- gem 'activeadmin', '~> 1.0.0.pre5'
26
- ```
27
-
28
- *Keep in mind that during the time where we use `pre`-release label, things can break in each release!*
29
-
30
- ### Rails 5
31
-
32
- Active Admin master has preliminary support for Rails 5. To give it a try, these Gemfile changes may be needed:
33
-
34
- ```ruby
35
- gem 'inherited_resources', git: 'https://github.com/activeadmin/inherited_resources'
36
- ```
37
-
38
- ### 0.6.x
39
-
40
- The plan is to follow [semantic versioning](http://semver.org/) as of 1.0.0. The 0.6.x line will
41
- still be maintained, and we will backport bug fixes into future 0.6.x releases. If you don't want
42
- to have to wait for a release, you can track the branch instead:
43
-
44
- ```ruby
45
- gem 'activeadmin', git: 'https://github.com/activeadmin/activeadmin', branch: '0-6-stable'
46
- ```
47
-
48
- ## Documentation
49
-
50
- For the latest docs, check out the Github <http://activeadmin.info> and the [wiki](https://github.com/activeadmin/activeadmin/wiki).
51
-
52
- ## Links
53
-
54
- * Website: <http://activeadmin.info>
55
- * Live demo: <http://demo.activeadmin.info/admin>
56
- * Documentation
57
- * Guides: <https://github.com/activeadmin/activeadmin/tree/master/docs>
58
- * YARD: <http://rubydoc.info/gems/activeadmin>
59
- * Wiki: <https://github.com/activeadmin/activeadmin/wiki>
10
+ [![Gratipay Team ](https://img.shields.io/gratipay/team/Active-Admin.svg)](https://gratipay.com/Active-Admin/)
60
11
 
61
12
  ## Goals
62
13
 
@@ -66,19 +17,31 @@ For the latest docs, check out the Github <http://activeadmin.info> and the [wik
66
17
 
67
18
  ## Getting started
68
19
 
69
- Check out [the docs](http://activeadmin.info/0-installation.html)!
20
+ * Check out [the docs](http://activeadmin.info/0-installation.html)!
21
+ * Try the [live demo](http://demo.activeadmin.info/admin)
22
+ * The [wiki](https://github.com/activeadmin/activeadmin/wiki) includes links to tutorials, articles and sample projects.
70
23
 
71
24
  ## Need help?
72
25
 
73
- Ask us in IRC ([#activeadmin](https://webchat.freenode.net/?channels=activeadmin)), on the
74
- [mailing list](http://groups.google.com/group/activeadmin), or on
75
- [Stack Overflow](http://stackoverflow.com/questions/tagged/activeadmin).
26
+ Please use [StackOverflow](http://stackoverflow.com/questions/tagged/activeadmin) for
27
+ help requests and how-to questions.
28
+
29
+ Please open GitHub issues for bugs and enhancements only, not general help requests.
30
+ Please search previous issues (and Google and StackOverflow) before creating a new issue.
31
+
32
+ Google Groups, IRC #activeadmin and Gitter are not actively monitored.
76
33
 
77
34
  ## Want to contribute?
78
35
 
79
36
  The [contributing guide](https://github.com/activeadmin/activeadmin/blob/master/CONTRIBUTING.md)
80
37
  is a good place to start. If you have questions, feel free to ask.
81
38
 
39
+ ## Want to support us?
40
+
41
+ You can support us with a weekly tip via [Gratipay](https://gratipay.com).
42
+
43
+ [![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.3/dist/gratipay.png)](https://gratipay.com/Active-Admin)
44
+
82
45
  ## Dependencies
83
46
 
84
47
  We try not to reinvent the wheel, so Active Admin is built with other open source projects:
@@ -95,6 +58,6 @@ Tool | Description
95
58
  [Arbre]: https://github.com/activeadmin/arbre
96
59
  [Devise]: https://github.com/plataformatec/devise
97
60
  [Formtastic]: https://github.com/justinfrench/formtastic
98
- [Inherited Resources]: https://github.com/josevalim/inherited_resources
61
+ [Inherited Resources]: https://github.com/activeadmin/inherited_resources
99
62
  [Kaminari]: https://github.com/kaminari/kaminari
100
63
  [Ransack]: https://github.com/activerecord-hackery/ransack