activeadmin 0.6.4 → 0.6.5

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 (11) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +5 -1
  3. data/CHANGELOG.md +193 -180
  4. data/Gemfile +1 -0
  5. data/activeadmin.gemspec +1 -6
  6. data/lib/active_admin/application.rb +1 -1
  7. data/lib/active_admin/helpers/collection.rb +2 -2
  8. data/lib/active_admin/resource_dsl.rb +2 -1
  9. data/lib/active_admin/version.rb +1 -1
  10. data/spec/unit/controller_filters_spec.rb +5 -0
  11. metadata +2 -68
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 329a21beba665a20492d87c4154a6a762c557822
4
- data.tar.gz: addbedade80ec32dda5cfa1b142dce11c44d7187
3
+ metadata.gz: 842a8c9499f04c81ff55eec25e730a6a3b4200b3
4
+ data.tar.gz: aa2c77337e5e893d15ee1de11b2f39dff75038ee
5
5
  SHA512:
6
- metadata.gz: c146ca594b7a6e616639dbd44843e201c819a5f8e44c2fc8c6a27afc49b03f5a239fd665abbc531c1d0d617c8fd70ab7c71898526620ae9b92d508b6dc25c96b
7
- data.tar.gz: f3edbd454acd02b042cbd8b87950f13bcd813f3df3cf0d03fd1cce18f1a806f48a8129d1a6e9450fed08771187ae20bd735cd70a5c9604d1f31390189d109fde
6
+ metadata.gz: 215b347f690e66ec1e6d763e588f4f0afeb0e6c7dd35f3d087a94906dd429613879299f99f953e9c4b7f9ac3e4a0fe9927ef1ab141fb4693617878ae8b846beb
7
+ data.tar.gz: 59d6acc3c8adb45d1e66aabd36b28171b570621dc7074aa8d391b66c038fc17a58230239e5ec1452e24c86d14ce7c698d7b65902dba9a36a118b0d5b8eb76209
data/.travis.yml CHANGED
@@ -2,6 +2,7 @@ script: bundle exec rake test
2
2
  rvm:
3
3
  - 1.9.3
4
4
  - 2.0.0
5
+ - 2.2.0
5
6
  before_install:
6
7
  - gem update --system
7
8
  - gem --version
@@ -11,5 +12,8 @@ env:
11
12
  - RAILS=3.1.12
12
13
  - RAILS=3.2.14
13
14
  matrix:
14
- allow_failures:
15
+ exclude:
15
16
  - rvm: 2.0.0
17
+ env: RAILS=3.0.20
18
+ - rvm: 2.2.0
19
+ env: RAILS=3.0.20
data/CHANGELOG.md CHANGED
@@ -1,4 +1,8 @@
1
- ## 0-6-stable (unreleased) - [compare](https://github.com/gregbell/active_admin/compare/v0.6.4...0-6-stable)
1
+ ## 0-6-stable (unreleased) - [compare](https://github.com/gregbell/active_admin/compare/v0.6.5...0-6-stable)
2
+
3
+ ## 0.6.5 - [compare](https://github.com/gregbell/active_admin/compare/v0.6.4...v0.6.5)
4
+
5
+ * Backport of [#2715][] by [@timoschilling][]
2
6
 
3
7
  ## 0.6.4 - [compare](https://github.com/gregbell/active_admin/compare/v0.6.3...v0.6.4)
4
8
 
@@ -749,184 +753,189 @@ of the highlights. 250 commits. Enough said.
749
753
  * Initial release
750
754
 
751
755
  <!--- The following link definition list is generated by PimpMyChangelog --->
752
- [#21]: https://github.com/gregbell/active_admin/issues/21
753
- [#22]: https://github.com/gregbell/active_admin/issues/22
754
- [#28]: https://github.com/gregbell/active_admin/issues/28
755
- [#31]: https://github.com/gregbell/active_admin/issues/31
756
- [#32]: https://github.com/gregbell/active_admin/issues/32
757
- [#34]: https://github.com/gregbell/active_admin/issues/34
758
- [#38]: https://github.com/gregbell/active_admin/issues/38
759
- [#42]: https://github.com/gregbell/active_admin/issues/42
760
- [#45]: https://github.com/gregbell/active_admin/issues/45
761
- [#48]: https://github.com/gregbell/active_admin/issues/48
762
- [#52]: https://github.com/gregbell/active_admin/issues/52
763
- [#55]: https://github.com/gregbell/active_admin/issues/55
764
- [#69]: https://github.com/gregbell/active_admin/issues/69
765
- [#70]: https://github.com/gregbell/active_admin/issues/70
766
- [#77]: https://github.com/gregbell/active_admin/issues/77
767
- [#92]: https://github.com/gregbell/active_admin/issues/92
768
- [#95]: https://github.com/gregbell/active_admin/issues/95
769
- [#96]: https://github.com/gregbell/active_admin/issues/96
770
- [#99]: https://github.com/gregbell/active_admin/issues/99
771
- [#100]: https://github.com/gregbell/active_admin/issues/100
772
- [#101]: https://github.com/gregbell/active_admin/issues/101
773
- [#110]: https://github.com/gregbell/active_admin/issues/110
774
- [#122]: https://github.com/gregbell/active_admin/issues/122
775
- [#131]: https://github.com/gregbell/active_admin/issues/131
776
- [#135]: https://github.com/gregbell/active_admin/issues/135
777
- [#154]: https://github.com/gregbell/active_admin/issues/154
778
- [#171]: https://github.com/gregbell/active_admin/issues/171
779
- [#186]: https://github.com/gregbell/active_admin/issues/186
780
- [#197]: https://github.com/gregbell/active_admin/issues/197
781
- [#222]: https://github.com/gregbell/active_admin/issues/222
782
- [#235]: https://github.com/gregbell/active_admin/issues/235
783
- [#248]: https://github.com/gregbell/active_admin/issues/248
784
- [#255]: https://github.com/gregbell/active_admin/issues/255
785
- [#332]: https://github.com/gregbell/active_admin/issues/332
786
- [#369]: https://github.com/gregbell/active_admin/issues/369
787
- [#381]: https://github.com/gregbell/active_admin/issues/381
788
- [#409]: https://github.com/gregbell/active_admin/issues/409
789
- [#428]: https://github.com/gregbell/active_admin/issues/428
790
- [#468]: https://github.com/gregbell/active_admin/issues/468
791
- [#470]: https://github.com/gregbell/active_admin/issues/470
792
- [#496]: https://github.com/gregbell/active_admin/issues/496
793
- [#497]: https://github.com/gregbell/active_admin/issues/497
794
- [#505]: https://github.com/gregbell/active_admin/issues/505
795
- [#527]: https://github.com/gregbell/active_admin/issues/527
796
- [#551]: https://github.com/gregbell/active_admin/issues/551
797
- [#555]: https://github.com/gregbell/active_admin/issues/555
798
- [#590]: https://github.com/gregbell/active_admin/issues/590
799
- [#601]: https://github.com/gregbell/active_admin/issues/601
800
- [#605]: https://github.com/gregbell/active_admin/issues/605
801
- [#623]: https://github.com/gregbell/active_admin/issues/623
802
- [#624]: https://github.com/gregbell/active_admin/issues/624
803
- [#637]: https://github.com/gregbell/active_admin/issues/637
804
- [#638]: https://github.com/gregbell/active_admin/issues/638
805
- [#644]: https://github.com/gregbell/active_admin/issues/644
806
- [#689]: https://github.com/gregbell/active_admin/issues/689
807
- [#711]: https://github.com/gregbell/active_admin/issues/711
808
- [#723]: https://github.com/gregbell/active_admin/issues/723
809
- [#741]: https://github.com/gregbell/active_admin/issues/741
810
- [#751]: https://github.com/gregbell/active_admin/issues/751
811
- [#758]: https://github.com/gregbell/active_admin/issues/758
812
- [#780]: https://github.com/gregbell/active_admin/issues/780
813
- [#822]: https://github.com/gregbell/active_admin/issues/822
814
- [#865]: https://github.com/gregbell/active_admin/issues/865
815
- [#869]: https://github.com/gregbell/active_admin/issues/869
816
- [#897]: https://github.com/gregbell/active_admin/issues/897
817
- [#905]: https://github.com/gregbell/active_admin/issues/905
818
- [#931]: https://github.com/gregbell/active_admin/issues/931
819
- [#960]: https://github.com/gregbell/active_admin/issues/960
820
- [#971]: https://github.com/gregbell/active_admin/issues/971
821
- [#978]: https://github.com/gregbell/active_admin/issues/978
822
- [#983]: https://github.com/gregbell/active_admin/issues/983
823
- [#993]: https://github.com/gregbell/active_admin/issues/993
824
- [#994]: https://github.com/gregbell/active_admin/issues/994
825
- [#1013]: https://github.com/gregbell/active_admin/issues/1013
826
- [#1016]: https://github.com/gregbell/active_admin/issues/1016
827
- [#1023]: https://github.com/gregbell/active_admin/issues/1023
828
- [#1032]: https://github.com/gregbell/active_admin/issues/1032
829
- [#1033]: https://github.com/gregbell/active_admin/issues/1033
830
- [#1041]: https://github.com/gregbell/active_admin/issues/1041
831
- [#1063]: https://github.com/gregbell/active_admin/issues/1063
832
- [#1117]: https://github.com/gregbell/active_admin/issues/1117
833
- [#1439]: https://github.com/gregbell/active_admin/issues/1439
834
- [#1609]: https://github.com/gregbell/active_admin/issues/1609
835
- [#1626]: https://github.com/gregbell/active_admin/issues/1626
836
- [#1647]: https://github.com/gregbell/active_admin/issues/1647
837
- [#1664]: https://github.com/gregbell/active_admin/issues/1664
838
- [#1668]: https://github.com/gregbell/active_admin/issues/1668
839
- [#1681]: https://github.com/gregbell/active_admin/issues/1681
840
- [#1683]: https://github.com/gregbell/active_admin/issues/1683
841
- [#1699]: https://github.com/gregbell/active_admin/issues/1699
842
- [#1745]: https://github.com/gregbell/active_admin/issues/1745
843
- [#1752]: https://github.com/gregbell/active_admin/issues/1752
844
- [#1775]: https://github.com/gregbell/active_admin/issues/1775
845
- [#1782]: https://github.com/gregbell/active_admin/issues/1782
846
- [#1783]: https://github.com/gregbell/active_admin/issues/1783
847
- [#1788]: https://github.com/gregbell/active_admin/issues/1788
848
- [#1801]: https://github.com/gregbell/active_admin/issues/1801
849
- [#1804]: https://github.com/gregbell/active_admin/issues/1804
850
- [#1805]: https://github.com/gregbell/active_admin/issues/1805
851
- [#1817]: https://github.com/gregbell/active_admin/issues/1817
852
- [#1834]: https://github.com/gregbell/active_admin/issues/1834
853
- [#1861]: https://github.com/gregbell/active_admin/issues/1861
854
- [#1867]: https://github.com/gregbell/active_admin/issues/1867
855
- [#1871]: https://github.com/gregbell/active_admin/issues/1871
856
- [#1873]: https://github.com/gregbell/active_admin/issues/1873
857
- [#1893]: https://github.com/gregbell/active_admin/issues/1893
858
- [#1896]: https://github.com/gregbell/active_admin/issues/1896
859
- [#1908]: https://github.com/gregbell/active_admin/issues/1908
860
- [#1913]: https://github.com/gregbell/active_admin/issues/1913
861
- [#1916]: https://github.com/gregbell/active_admin/issues/1916
862
- [#1928]: https://github.com/gregbell/active_admin/issues/1928
863
- [#1929]: https://github.com/gregbell/active_admin/issues/1929
864
- [#1933]: https://github.com/gregbell/active_admin/issues/1933
865
- [#1937]: https://github.com/gregbell/active_admin/issues/1937
866
- [#1940]: https://github.com/gregbell/active_admin/issues/1940
867
- [#1947]: https://github.com/gregbell/active_admin/issues/1947
868
- [#1952]: https://github.com/gregbell/active_admin/issues/1952
869
- [#1960]: https://github.com/gregbell/active_admin/issues/1960
870
- [#1961]: https://github.com/gregbell/active_admin/issues/1961
871
- [#1962]: https://github.com/gregbell/active_admin/issues/1962
872
- [#1966]: https://github.com/gregbell/active_admin/issues/1966
873
- [#1967]: https://github.com/gregbell/active_admin/issues/1967
874
- [#1973]: https://github.com/gregbell/active_admin/issues/1973
875
- [#2000]: https://github.com/gregbell/active_admin/issues/2000
876
- [#2015]: https://github.com/gregbell/active_admin/issues/2015
877
- [#2018]: https://github.com/gregbell/active_admin/issues/2018
878
- [#2043]: https://github.com/gregbell/active_admin/issues/2043
879
- [#2044]: https://github.com/gregbell/active_admin/issues/2044
880
- [#2046]: https://github.com/gregbell/active_admin/issues/2046
881
- [#2054]: https://github.com/gregbell/active_admin/issues/2054
882
- [#2058]: https://github.com/gregbell/active_admin/issues/2058
883
- [#2060]: https://github.com/gregbell/active_admin/issues/2060
884
- [#2062]: https://github.com/gregbell/active_admin/issues/2062
885
- [#2068]: https://github.com/gregbell/active_admin/issues/2068
886
- [#2071]: https://github.com/gregbell/active_admin/issues/2071
887
- [#2072]: https://github.com/gregbell/active_admin/issues/2072
888
- [#2075]: https://github.com/gregbell/active_admin/issues/2075
889
- [#2083]: https://github.com/gregbell/active_admin/issues/2083
890
- [#2084]: https://github.com/gregbell/active_admin/issues/2084
891
- [#2085]: https://github.com/gregbell/active_admin/issues/2085
892
- [#2087]: https://github.com/gregbell/active_admin/issues/2087
893
- [#2088]: https://github.com/gregbell/active_admin/issues/2088
894
- [#2089]: https://github.com/gregbell/active_admin/issues/2089
895
- [#2090]: https://github.com/gregbell/active_admin/issues/2090
896
- [#2095]: https://github.com/gregbell/active_admin/issues/2095
897
- [#2096]: https://github.com/gregbell/active_admin/issues/2096
898
- [#2099]: https://github.com/gregbell/active_admin/issues/2099
899
- [#2107]: https://github.com/gregbell/active_admin/issues/2107
900
- [#2113]: https://github.com/gregbell/active_admin/issues/2113
901
- [#2125]: https://github.com/gregbell/active_admin/issues/2125
902
- [#2134]: https://github.com/gregbell/active_admin/issues/2134
903
- [#2139]: https://github.com/gregbell/active_admin/issues/2139
904
- [#2147]: https://github.com/gregbell/active_admin/issues/2147
905
- [#2150]: https://github.com/gregbell/active_admin/issues/2150
906
- [#2154]: https://github.com/gregbell/active_admin/issues/2154
907
- [#2162]: https://github.com/gregbell/active_admin/issues/2162
908
- [#2165]: https://github.com/gregbell/active_admin/issues/2165
909
- [#2175]: https://github.com/gregbell/active_admin/issues/2175
910
- [#2186]: https://github.com/gregbell/active_admin/issues/2186
911
- [#2215]: https://github.com/gregbell/active_admin/issues/2215
912
- [#2221]: https://github.com/gregbell/active_admin/issues/2221
913
- [#2228]: https://github.com/gregbell/active_admin/issues/2228
914
- [#2231]: https://github.com/gregbell/active_admin/issues/2231
915
- [#2255]: https://github.com/gregbell/active_admin/issues/2255
916
- [#2258]: https://github.com/gregbell/active_admin/issues/2258
917
- [#2313]: https://github.com/gregbell/active_admin/issues/2313
918
- [#2315]: https://github.com/gregbell/active_admin/issues/2315
919
- [#2319]: https://github.com/gregbell/active_admin/issues/2319
920
- [#2333]: https://github.com/gregbell/active_admin/issues/2333
921
- [#2348]: https://github.com/gregbell/active_admin/issues/2348
922
- [#2395]: https://github.com/gregbell/active_admin/issues/2395
923
- [#2403]: https://github.com/gregbell/active_admin/issues/2403
924
- [#2416]: https://github.com/gregbell/active_admin/issues/2416
925
- [#2419]: https://github.com/gregbell/active_admin/issues/2419
926
- [#2420]: https://github.com/gregbell/active_admin/issues/2420
927
- [#2454]: https://github.com/gregbell/active_admin/issues/2454
928
- [#3489]: https://github.com/gregbell/active_admin/issues/3489
929
- [#3659]: https://github.com/gregbell/active_admin/issues/3659
756
+ [#21]: https://github.com/activeadmin/activeadmin/issues/21
757
+ [#22]: https://github.com/activeadmin/activeadmin/issues/22
758
+ [#28]: https://github.com/activeadmin/activeadmin/issues/28
759
+ [#31]: https://github.com/activeadmin/activeadmin/issues/31
760
+ [#32]: https://github.com/activeadmin/activeadmin/issues/32
761
+ [#34]: https://github.com/activeadmin/activeadmin/issues/34
762
+ [#38]: https://github.com/activeadmin/activeadmin/issues/38
763
+ [#42]: https://github.com/activeadmin/activeadmin/issues/42
764
+ [#45]: https://github.com/activeadmin/activeadmin/issues/45
765
+ [#48]: https://github.com/activeadmin/activeadmin/issues/48
766
+ [#52]: https://github.com/activeadmin/activeadmin/issues/52
767
+ [#55]: https://github.com/activeadmin/activeadmin/issues/55
768
+ [#69]: https://github.com/activeadmin/activeadmin/issues/69
769
+ [#70]: https://github.com/activeadmin/activeadmin/issues/70
770
+ [#77]: https://github.com/activeadmin/activeadmin/issues/77
771
+ [#92]: https://github.com/activeadmin/activeadmin/issues/92
772
+ [#95]: https://github.com/activeadmin/activeadmin/issues/95
773
+ [#96]: https://github.com/activeadmin/activeadmin/issues/96
774
+ [#99]: https://github.com/activeadmin/activeadmin/issues/99
775
+ [#100]: https://github.com/activeadmin/activeadmin/issues/100
776
+ [#101]: https://github.com/activeadmin/activeadmin/issues/101
777
+ [#110]: https://github.com/activeadmin/activeadmin/issues/110
778
+ [#122]: https://github.com/activeadmin/activeadmin/issues/122
779
+ [#131]: https://github.com/activeadmin/activeadmin/issues/131
780
+ [#135]: https://github.com/activeadmin/activeadmin/issues/135
781
+ [#154]: https://github.com/activeadmin/activeadmin/issues/154
782
+ [#171]: https://github.com/activeadmin/activeadmin/issues/171
783
+ [#186]: https://github.com/activeadmin/activeadmin/issues/186
784
+ [#197]: https://github.com/activeadmin/activeadmin/issues/197
785
+ [#222]: https://github.com/activeadmin/activeadmin/issues/222
786
+ [#235]: https://github.com/activeadmin/activeadmin/issues/235
787
+ [#248]: https://github.com/activeadmin/activeadmin/issues/248
788
+ [#255]: https://github.com/activeadmin/activeadmin/issues/255
789
+ [#332]: https://github.com/activeadmin/activeadmin/issues/332
790
+ [#369]: https://github.com/activeadmin/activeadmin/issues/369
791
+ [#381]: https://github.com/activeadmin/activeadmin/issues/381
792
+ [#409]: https://github.com/activeadmin/activeadmin/issues/409
793
+ [#428]: https://github.com/activeadmin/activeadmin/issues/428
794
+ [#468]: https://github.com/activeadmin/activeadmin/issues/468
795
+ [#470]: https://github.com/activeadmin/activeadmin/issues/470
796
+ [#496]: https://github.com/activeadmin/activeadmin/issues/496
797
+ [#497]: https://github.com/activeadmin/activeadmin/issues/497
798
+ [#505]: https://github.com/activeadmin/activeadmin/issues/505
799
+ [#527]: https://github.com/activeadmin/activeadmin/issues/527
800
+ [#551]: https://github.com/activeadmin/activeadmin/issues/551
801
+ [#555]: https://github.com/activeadmin/activeadmin/issues/555
802
+ [#590]: https://github.com/activeadmin/activeadmin/issues/590
803
+ [#601]: https://github.com/activeadmin/activeadmin/issues/601
804
+ [#605]: https://github.com/activeadmin/activeadmin/issues/605
805
+ [#623]: https://github.com/activeadmin/activeadmin/issues/623
806
+ [#624]: https://github.com/activeadmin/activeadmin/issues/624
807
+ [#637]: https://github.com/activeadmin/activeadmin/issues/637
808
+ [#638]: https://github.com/activeadmin/activeadmin/issues/638
809
+ [#644]: https://github.com/activeadmin/activeadmin/issues/644
810
+ [#689]: https://github.com/activeadmin/activeadmin/issues/689
811
+ [#711]: https://github.com/activeadmin/activeadmin/issues/711
812
+ [#723]: https://github.com/activeadmin/activeadmin/issues/723
813
+ [#741]: https://github.com/activeadmin/activeadmin/issues/741
814
+ [#751]: https://github.com/activeadmin/activeadmin/issues/751
815
+ [#758]: https://github.com/activeadmin/activeadmin/issues/758
816
+ [#780]: https://github.com/activeadmin/activeadmin/issues/780
817
+ [#822]: https://github.com/activeadmin/activeadmin/issues/822
818
+ [#865]: https://github.com/activeadmin/activeadmin/issues/865
819
+ [#869]: https://github.com/activeadmin/activeadmin/issues/869
820
+ [#897]: https://github.com/activeadmin/activeadmin/issues/897
821
+ [#905]: https://github.com/activeadmin/activeadmin/issues/905
822
+ [#931]: https://github.com/activeadmin/activeadmin/issues/931
823
+ [#960]: https://github.com/activeadmin/activeadmin/issues/960
824
+ [#971]: https://github.com/activeadmin/activeadmin/issues/971
825
+ [#978]: https://github.com/activeadmin/activeadmin/issues/978
826
+ [#983]: https://github.com/activeadmin/activeadmin/issues/983
827
+ [#993]: https://github.com/activeadmin/activeadmin/issues/993
828
+ [#994]: https://github.com/activeadmin/activeadmin/issues/994
829
+ [#1013]: https://github.com/activeadmin/activeadmin/issues/1013
830
+ [#1016]: https://github.com/activeadmin/activeadmin/issues/1016
831
+ [#1023]: https://github.com/activeadmin/activeadmin/issues/1023
832
+ [#1032]: https://github.com/activeadmin/activeadmin/issues/1032
833
+ [#1033]: https://github.com/activeadmin/activeadmin/issues/1033
834
+ [#1041]: https://github.com/activeadmin/activeadmin/issues/1041
835
+ [#1063]: https://github.com/activeadmin/activeadmin/issues/1063
836
+ [#1117]: https://github.com/activeadmin/activeadmin/issues/1117
837
+ [#1439]: https://github.com/activeadmin/activeadmin/issues/1439
838
+ [#1609]: https://github.com/activeadmin/activeadmin/issues/1609
839
+ [#1626]: https://github.com/activeadmin/activeadmin/issues/1626
840
+ [#1647]: https://github.com/activeadmin/activeadmin/issues/1647
841
+ [#1664]: https://github.com/activeadmin/activeadmin/issues/1664
842
+ [#1668]: https://github.com/activeadmin/activeadmin/issues/1668
843
+ [#1681]: https://github.com/activeadmin/activeadmin/issues/1681
844
+ [#1683]: https://github.com/activeadmin/activeadmin/issues/1683
845
+ [#1699]: https://github.com/activeadmin/activeadmin/issues/1699
846
+ [#1745]: https://github.com/activeadmin/activeadmin/issues/1745
847
+ [#1752]: https://github.com/activeadmin/activeadmin/issues/1752
848
+ [#1775]: https://github.com/activeadmin/activeadmin/issues/1775
849
+ [#1782]: https://github.com/activeadmin/activeadmin/issues/1782
850
+ [#1783]: https://github.com/activeadmin/activeadmin/issues/1783
851
+ [#1788]: https://github.com/activeadmin/activeadmin/issues/1788
852
+ [#1801]: https://github.com/activeadmin/activeadmin/issues/1801
853
+ [#1804]: https://github.com/activeadmin/activeadmin/issues/1804
854
+ [#1805]: https://github.com/activeadmin/activeadmin/issues/1805
855
+ [#1817]: https://github.com/activeadmin/activeadmin/issues/1817
856
+ [#1834]: https://github.com/activeadmin/activeadmin/issues/1834
857
+ [#1861]: https://github.com/activeadmin/activeadmin/issues/1861
858
+ [#1867]: https://github.com/activeadmin/activeadmin/issues/1867
859
+ [#1871]: https://github.com/activeadmin/activeadmin/issues/1871
860
+ [#1873]: https://github.com/activeadmin/activeadmin/issues/1873
861
+ [#1893]: https://github.com/activeadmin/activeadmin/issues/1893
862
+ [#1896]: https://github.com/activeadmin/activeadmin/issues/1896
863
+ [#1908]: https://github.com/activeadmin/activeadmin/issues/1908
864
+ [#1913]: https://github.com/activeadmin/activeadmin/issues/1913
865
+ [#1916]: https://github.com/activeadmin/activeadmin/issues/1916
866
+ [#1928]: https://github.com/activeadmin/activeadmin/issues/1928
867
+ [#1929]: https://github.com/activeadmin/activeadmin/issues/1929
868
+ [#1933]: https://github.com/activeadmin/activeadmin/issues/1933
869
+ [#1937]: https://github.com/activeadmin/activeadmin/issues/1937
870
+ [#1940]: https://github.com/activeadmin/activeadmin/issues/1940
871
+ [#1947]: https://github.com/activeadmin/activeadmin/issues/1947
872
+ [#1952]: https://github.com/activeadmin/activeadmin/issues/1952
873
+ [#1960]: https://github.com/activeadmin/activeadmin/issues/1960
874
+ [#1961]: https://github.com/activeadmin/activeadmin/issues/1961
875
+ [#1962]: https://github.com/activeadmin/activeadmin/issues/1962
876
+ [#1966]: https://github.com/activeadmin/activeadmin/issues/1966
877
+ [#1967]: https://github.com/activeadmin/activeadmin/issues/1967
878
+ [#1973]: https://github.com/activeadmin/activeadmin/issues/1973
879
+ [#2000]: https://github.com/activeadmin/activeadmin/issues/2000
880
+ [#2015]: https://github.com/activeadmin/activeadmin/issues/2015
881
+ [#2018]: https://github.com/activeadmin/activeadmin/issues/2018
882
+ [#2043]: https://github.com/activeadmin/activeadmin/issues/2043
883
+ [#2044]: https://github.com/activeadmin/activeadmin/issues/2044
884
+ [#2046]: https://github.com/activeadmin/activeadmin/issues/2046
885
+ [#2054]: https://github.com/activeadmin/activeadmin/issues/2054
886
+ [#2058]: https://github.com/activeadmin/activeadmin/issues/2058
887
+ [#2060]: https://github.com/activeadmin/activeadmin/issues/2060
888
+ [#2062]: https://github.com/activeadmin/activeadmin/issues/2062
889
+ [#2068]: https://github.com/activeadmin/activeadmin/issues/2068
890
+ [#2071]: https://github.com/activeadmin/activeadmin/issues/2071
891
+ [#2072]: https://github.com/activeadmin/activeadmin/issues/2072
892
+ [#2075]: https://github.com/activeadmin/activeadmin/issues/2075
893
+ [#2083]: https://github.com/activeadmin/activeadmin/issues/2083
894
+ [#2084]: https://github.com/activeadmin/activeadmin/issues/2084
895
+ [#2085]: https://github.com/activeadmin/activeadmin/issues/2085
896
+ [#2087]: https://github.com/activeadmin/activeadmin/issues/2087
897
+ [#2088]: https://github.com/activeadmin/activeadmin/issues/2088
898
+ [#2089]: https://github.com/activeadmin/activeadmin/issues/2089
899
+ [#2090]: https://github.com/activeadmin/activeadmin/issues/2090
900
+ [#2095]: https://github.com/activeadmin/activeadmin/issues/2095
901
+ [#2096]: https://github.com/activeadmin/activeadmin/issues/2096
902
+ [#2099]: https://github.com/activeadmin/activeadmin/issues/2099
903
+ [#2107]: https://github.com/activeadmin/activeadmin/issues/2107
904
+ [#2113]: https://github.com/activeadmin/activeadmin/issues/2113
905
+ [#2125]: https://github.com/activeadmin/activeadmin/issues/2125
906
+ [#2134]: https://github.com/activeadmin/activeadmin/issues/2134
907
+ [#2139]: https://github.com/activeadmin/activeadmin/issues/2139
908
+ [#2147]: https://github.com/activeadmin/activeadmin/issues/2147
909
+ [#2150]: https://github.com/activeadmin/activeadmin/issues/2150
910
+ [#2154]: https://github.com/activeadmin/activeadmin/issues/2154
911
+ [#2162]: https://github.com/activeadmin/activeadmin/issues/2162
912
+ [#2165]: https://github.com/activeadmin/activeadmin/issues/2165
913
+ [#2175]: https://github.com/activeadmin/activeadmin/issues/2175
914
+ [#2186]: https://github.com/activeadmin/activeadmin/issues/2186
915
+ [#2215]: https://github.com/activeadmin/activeadmin/issues/2215
916
+ [#2221]: https://github.com/activeadmin/activeadmin/issues/2221
917
+ [#2228]: https://github.com/activeadmin/activeadmin/issues/2228
918
+ [#2231]: https://github.com/activeadmin/activeadmin/issues/2231
919
+ [#2255]: https://github.com/activeadmin/activeadmin/issues/2255
920
+ [#2258]: https://github.com/activeadmin/activeadmin/issues/2258
921
+ [#2313]: https://github.com/activeadmin/activeadmin/issues/2313
922
+ [#2315]: https://github.com/activeadmin/activeadmin/issues/2315
923
+ [#2319]: https://github.com/activeadmin/activeadmin/issues/2319
924
+ [#2333]: https://github.com/activeadmin/activeadmin/issues/2333
925
+ [#2348]: https://github.com/activeadmin/activeadmin/issues/2348
926
+ [#2395]: https://github.com/activeadmin/activeadmin/issues/2395
927
+ [#2403]: https://github.com/activeadmin/activeadmin/issues/2403
928
+ [#2416]: https://github.com/activeadmin/activeadmin/issues/2416
929
+ [#2419]: https://github.com/activeadmin/activeadmin/issues/2419
930
+ [#2420]: https://github.com/activeadmin/activeadmin/issues/2420
931
+ [#2454]: https://github.com/activeadmin/activeadmin/issues/2454
932
+ [#2588]: https://github.com/activeadmin/activeadmin/issues/2588
933
+ [#2601]: https://github.com/activeadmin/activeadmin/issues/2601
934
+ [#2715]: https://github.com/activeadmin/activeadmin/issues/2715
935
+ [#2744]: https://github.com/activeadmin/activeadmin/issues/2744
936
+ [#2847]: https://github.com/activeadmin/activeadmin/issues/2847
937
+ [#3489]: https://github.com/activeadmin/activeadmin/issues/3489
938
+ [#3659]: https://github.com/activeadmin/activeadmin/issues/3659
930
939
  [@Bishop]: https://github.com/Bishop
931
940
  [@BoboFraggins]: https://github.com/BoboFraggins
932
941
  [@DMajrekar]: https://github.com/DMajrekar
@@ -961,6 +970,7 @@ of the highlights. 250 commits. Enough said.
961
970
  [@fbuenemann]: https://github.com/fbuenemann
962
971
  [@george]: https://github.com/george
963
972
  [@ggilder]: https://github.com/ggilder
973
+ [@givanse]: https://github.com/givanse
964
974
  [@gregbell]: https://github.com/gregbell
965
975
  [@hakanensari]: https://github.com/hakanensari
966
976
  [@henrrrik]: https://github.com/henrrrik
@@ -971,6 +981,7 @@ of the highlights. 250 commits. Enough said.
971
981
  [@jbarket]: https://github.com/jbarket
972
982
  [@jbhannah]: https://github.com/jbhannah
973
983
  [@jherdman]: https://github.com/jherdman
984
+ [@jjarmoc]: https://github.com/jjarmoc
974
985
  [@johnnyshields]: https://github.com/johnnyshields
975
986
  [@jokklan]: https://github.com/jokklan
976
987
  [@joseluistorres]: https://github.com/joseluistorres
@@ -1006,6 +1017,7 @@ of the highlights. 250 commits. Enough said.
1006
1017
  [@ronen]: https://github.com/ronen
1007
1018
  [@ryansch]: https://github.com/ryansch
1008
1019
  [@samvincent]: https://github.com/samvincent
1020
+ [@seanlinsley]: https://github.com/seanlinsley
1009
1021
  [@sftsang]: https://github.com/sftsang
1010
1022
  [@shayfrendt]: https://github.com/shayfrendt
1011
1023
  [@shekibobo]: https://github.com/shekibobo
@@ -1015,6 +1027,7 @@ of the highlights. 250 commits. Enough said.
1015
1027
  [@stereoscott]: https://github.com/stereoscott
1016
1028
  [@sunny]: https://github.com/sunny
1017
1029
  [@tank-bohr]: https://github.com/tank-bohr
1030
+ [@teoulas]: https://github.com/teoulas
1018
1031
  [@timoschilling]: https://github.com/timoschilling
1019
1032
  [@tinynumbers]: https://github.com/tinynumbers
1020
1033
  [@tracedwax]: https://github.com/tracedwax
@@ -1027,4 +1040,4 @@ of the highlights. 250 commits. Enough said.
1027
1040
  [@whatcould]: https://github.com/whatcould
1028
1041
  [@yawn]: https://github.com/yawn
1029
1042
  [@yorch]: https://github.com/yorch
1030
- [@zorab47]: https://github.com/zorab47
1043
+ [@zorab47]: https://github.com/zorab47
data/Gemfile CHANGED
@@ -17,6 +17,7 @@ when /^3\.(1|2)/
17
17
  # These are the gems you have to have for Rails 3.1 to be happy
18
18
  gem 'sass-rails'
19
19
  gem 'uglifier'
20
+ gem "test-unit", "~>3.0" # a rails 3.2 on ruby 2.2 requirement
20
21
  else
21
22
  raise "Rails #{rails_version} is not supported yet"
22
23
  end
data/activeadmin.gemspec CHANGED
@@ -20,12 +20,7 @@ Gem::Specification.new do |s|
20
20
 
21
21
  s.add_dependency "arbre", "~> 1.0"
22
22
  s.add_dependency "bourbon", ">= 1.0.0", "< 4"
23
- s.add_dependency "devise", ">= 1.5.4", "< 4",
24
- # Exclude Devise versions vulnerable to CVE-2013-0233
25
- "!= 2.0.0", "!= 2.0.1", "!= 2.0.2", "!= 2.0.3", "!= 2.0.4",
26
- "!= 2.1.0", "!= 2.1.1", "!= 2.1.2",
27
- "!= 2.2.0", "!= 2.2.1", "!= 2.2.2"
28
- #
23
+ s.add_dependency "devise", ">= 1.5.4", "< 4"
29
24
  s.add_dependency "formtastic", "~> 2.0"
30
25
  s.add_dependency "inherited_resources", "~> 1.3"
31
26
  s.add_dependency "jquery-rails", ">= 1.0.0", "< 3"
data/lib/active_admin/application.rb CHANGED
@@ -190,7 +190,7 @@ module ActiveAdmin
190
190
  # Example usage:
191
191
  # ActiveAdmin.before_filter :authenticate_admin!
192
192
  #
193
- %w(before_filter skip_before_filter after_filter around_filter skip_filter).each do |name|
193
+ %w(before_filter skip_before_filter after_filter skip_after_filter around_filter skip_filter).each do |name|
194
194
  define_method name do |*args, &block|
195
195
  ActiveAdmin::BaseController.send name, *args, &block
196
196
  ActiveAdmin::Devise::PasswordsController.send name, *args, &block
data/lib/active_admin/helpers/collection.rb CHANGED
@@ -7,7 +7,7 @@ module ActiveAdmin
7
7
  # the ORDER statement mentions a column defined in the SELECT statement.
8
8
  #
9
9
  # We remove the ORDER statement to work around this issue.
10
- def collection_size(collection=collection)
10
+ def collection_size(collection=collection())
11
11
  size = collection.reorder("").count
12
12
  # when GROUP BY is used, AR returns Hash instead of Fixnum for .size
13
13
  size = size.size if size.kind_of?(Hash)
@@ -15,7 +15,7 @@ module ActiveAdmin
15
15
  size
16
16
  end
17
17
 
18
- def collection_is_empty?(collection=collection)
18
+ def collection_is_empty?(collection=collection())
19
19
  collection_size(collection) == 0
20
20
  end
21
21
  end
data/lib/active_admin/resource_dsl.rb CHANGED
@@ -117,7 +117,8 @@ module ActiveAdmin
117
117
  delegate :before_destroy, :after_destroy, :to => :controller
118
118
 
119
119
  # Standard rails filters
120
- delegate :before_filter, :skip_before_filter, :after_filter, :around_filter, :skip_filter, :to => :controller
120
+ delegate :before_filter, :skip_before_filter, :after_filter, :skip_after_filter, :around_filter, :skip_filter,
121
+ :to => :controller
121
122
 
122
123
  # Specify which actions to create in the controller
123
124
  #
data/lib/active_admin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ActiveAdmin
2
- VERSION = '0.6.4'
2
+ VERSION = '0.6.5'
3
3
  end
data/spec/unit/controller_filters_spec.rb CHANGED
@@ -20,6 +20,11 @@ describe ActiveAdmin::Application do
20
20
  application.after_filter :my_filter, :only => :show
21
21
  end
22
22
 
23
+ it 'skip after_filter' do
24
+ controllers.each{ |c| c.should_receive(:skip_after_filter).and_return(true) }
25
+ application.skip_after_filter :my_filter, :only => :show
26
+ end
27
+
23
28
  it 'around_filter' do
24
29
  controllers.each{ |c| c.should_receive(:around_filter).and_return(true) }
25
30
  application.around_filter :my_filter, :only => :show
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activeadmin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.4
4
+ version: 0.6.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Greg Bell
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-15 00:00:00.000000000 Z
11
+ date: 2015-01-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: arbre
@@ -54,39 +54,6 @@ dependencies:
54
54
  - - "<"
55
55
  - !ruby/object:Gem::Version
56
56
  version: '4'
57
- - - "!="
58
- - !ruby/object:Gem::Version
59
- version: 2.0.0
60
- - - "!="
61
- - !ruby/object:Gem::Version
62
- version: 2.0.1
63
- - - "!="
64
- - !ruby/object:Gem::Version
65
- version: 2.0.2
66
- - - "!="
67
- - !ruby/object:Gem::Version
68
- version: 2.0.3
69
- - - "!="
70
- - !ruby/object:Gem::Version
71
- version: 2.0.4
72
- - - "!="
73
- - !ruby/object:Gem::Version
74
- version: 2.1.0
75
- - - "!="
76
- - !ruby/object:Gem::Version
77
- version: 2.1.1
78
- - - "!="
79
- - !ruby/object:Gem::Version
80
- version: 2.1.2
81
- - - "!="
82
- - !ruby/object:Gem::Version
83
- version: 2.2.0
84
- - - "!="
85
- - !ruby/object:Gem::Version
86
- version: 2.2.1
87
- - - "!="
88
- - !ruby/object:Gem::Version
89
- version: 2.2.2
90
57
  type: :runtime
91
58
  prerelease: false
92
59
  version_requirements: !ruby/object:Gem::Requirement
@@ -97,39 +64,6 @@ dependencies:
97
64
  - - "<"
98
65
  - !ruby/object:Gem::Version
99
66
  version: '4'
100
- - - "!="
101
- - !ruby/object:Gem::Version
102
- version: 2.0.0
103
- - - "!="
104
- - !ruby/object:Gem::Version
105
- version: 2.0.1
106
- - - "!="
107
- - !ruby/object:Gem::Version
108
- version: 2.0.2
109
- - - "!="
110
- - !ruby/object:Gem::Version
111
- version: 2.0.3
112
- - - "!="
113
- - !ruby/object:Gem::Version
114
- version: 2.0.4
115
- - - "!="
116
- - !ruby/object:Gem::Version
117
- version: 2.1.0
118
- - - "!="
119
- - !ruby/object:Gem::Version
120
- version: 2.1.1
121
- - - "!="
122
- - !ruby/object:Gem::Version
123
- version: 2.1.2
124
- - - "!="
125
- - !ruby/object:Gem::Version
126
- version: 2.2.0
127
- - - "!="
128
- - !ruby/object:Gem::Version
129
- version: 2.2.1
130
- - - "!="
131
- - !ruby/object:Gem::Version
132
- version: 2.2.2
133
67
  - !ruby/object:Gem::Dependency
134
68
  name: formtastic
135
69
  requirement: !ruby/object:Gem::Requirement