Description:
Merge pull request #5 from jittat/master
consolidate after big merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r488:cc407fe59c1e - - 1 file changed: 15 inserted, 18 deleted
| @@ -37,7 +37,7 | |||||
|
|
37 | i18n (~> 0.6, >= 0.6.4) |
|
37 | i18n (~> 0.6, >= 0.6.4) |
|
|
38 | multi_json (~> 1.0) |
|
38 | multi_json (~> 1.0) |
|
|
39 | arel (3.0.3) |
|
39 | arel (3.0.3) |
|
|
40 |
- best_in_place (3.0. |
|
40 | + best_in_place (3.0.3) |
|
|
41 | actionpack (>= 3.2) |
|
41 | actionpack (>= 3.2) |
|
|
42 | railties (>= 3.2) |
|
42 | railties (>= 3.2) |
|
|
43 | builder (3.0.4) |
|
43 | builder (3.0.4) |
| @@ -47,23 +47,21 | |||||
|
|
47 | coffee-script (2.3.0) |
|
47 | coffee-script (2.3.0) |
|
|
48 | coffee-script-source |
|
48 | coffee-script-source |
|
|
49 | execjs |
|
49 | execjs |
|
|
50 |
- coffee-script-source (1. |
|
50 | + coffee-script-source (1.9.0) |
|
|
51 | diff-lcs (1.2.5) |
|
51 | diff-lcs (1.2.5) |
|
|
52 | dynamic_form (1.1.4) |
|
52 | dynamic_form (1.1.4) |
|
|
53 | erubis (2.7.0) |
|
53 | erubis (2.7.0) |
|
|
54 |
- execjs (2. |
|
54 | + execjs (2.3.0) |
|
|
55 | haml (4.0.6) |
|
55 | haml (4.0.6) |
|
|
56 | tilt |
|
56 | tilt |
|
|
57 | hike (1.2.3) |
|
57 | hike (1.2.3) |
|
|
58 | i18n (0.7.0) |
|
58 | i18n (0.7.0) |
|
|
59 | in_place_editing (1.2.0) |
|
59 | in_place_editing (1.2.0) |
|
|
60 | journey (1.0.4) |
|
60 | journey (1.0.4) |
|
|
61 | - json (1.8.1) |
|
61 | + jquery-rails (3.1.2) |
|
|
62 | - mail (2.5.4) |
|
||
|
|
63 | - jquery-rails (3.1.1) |
|
||
|
|
64 | railties (>= 3.0, < 5.0) |
|
62 | railties (>= 3.0, < 5.0) |
|
|
65 | thor (>= 0.14, < 2.0) |
|
63 | thor (>= 0.14, < 2.0) |
|
|
66 |
- jquery-tablesorter (1.1 |
|
64 | + jquery-tablesorter (1.13.4) |
|
|
67 | railties (>= 3.1, < 5) |
|
65 | railties (>= 3.1, < 5) |
|
|
68 | jquery-timepicker-addon-rails (1.4.1) |
|
66 | jquery-timepicker-addon-rails (1.4.1) |
|
|
69 | railties (>= 3.1) |
|
67 | railties (>= 3.1) |
| @@ -74,7 +72,7 | |||||
|
|
74 | jquery-rails |
|
72 | jquery-rails |
|
|
75 | jquery-ui-rails (= 4.0.3) |
|
73 | jquery-ui-rails (= 4.0.3) |
|
|
76 | railties (>= 3.1.0) |
|
74 | railties (>= 3.1.0) |
|
|
77 |
- json (1.8. |
|
75 | + json (1.8.2) |
|
|
78 | mail (2.5.4) |
|
76 | mail (2.5.4) |
|
|
79 | mime-types (~> 1.16) |
|
77 | mime-types (~> 1.16) |
|
|
80 | treetop (~> 1.4.8) |
|
78 | treetop (~> 1.4.8) |
| @@ -90,7 +88,7 | |||||
|
|
90 | rack (>= 0.4) |
|
88 | rack (>= 0.4) |
|
|
91 | rack-ssl (1.3.4) |
|
89 | rack-ssl (1.3.4) |
|
|
92 | rack |
|
90 | rack |
|
|
93 |
- rack-test (0.6. |
|
91 | + rack-test (0.6.3) |
|
|
94 | rack (>= 1.0) |
|
92 | rack (>= 1.0) |
|
|
95 | rails (3.2.21) |
|
93 | rails (3.2.21) |
|
|
96 | actionmailer (= 3.2.21) |
|
94 | actionmailer (= 3.2.21) |
| @@ -108,16 +106,16 | |||||
|
|
108 | rdoc (~> 3.4) |
|
106 | rdoc (~> 3.4) |
|
|
109 | thor (>= 0.14.6, < 2.0) |
|
107 | thor (>= 0.14.6, < 2.0) |
|
|
110 | rake (10.4.2) |
|
108 | rake (10.4.2) |
|
|
111 |
- rdiscount (2.1. |
|
109 | + rdiscount (2.1.8) |
|
|
112 | rdoc (3.12.2) |
|
110 | rdoc (3.12.2) |
|
|
113 | json (~> 1.4) |
|
111 | json (~> 1.4) |
|
|
114 |
- rouge (1. |
|
112 | + rouge (1.8.0) |
|
|
115 |
- rspec-collection_matchers (1. |
|
113 | + rspec-collection_matchers (1.1.2) |
|
|
116 | rspec-expectations (>= 2.99.0.beta1) |
|
114 | rspec-expectations (>= 2.99.0.beta1) |
|
|
117 | rspec-core (2.99.2) |
|
115 | rspec-core (2.99.2) |
|
|
118 | rspec-expectations (2.99.2) |
|
116 | rspec-expectations (2.99.2) |
|
|
119 | diff-lcs (>= 1.1.3, < 2.0) |
|
117 | diff-lcs (>= 1.1.3, < 2.0) |
|
|
120 |
- rspec-mocks (2.99. |
|
118 | + rspec-mocks (2.99.3) |
|
|
121 | rspec-rails (2.99.0) |
|
119 | rspec-rails (2.99.0) |
|
|
122 | actionpack (>= 3.0) |
|
120 | actionpack (>= 3.0) |
|
|
123 | activemodel (>= 3.0) |
|
121 | activemodel (>= 3.0) |
| @@ -127,7 +125,7 | |||||
|
|
127 | rspec-core (~> 2.99.0) |
|
125 | rspec-core (~> 2.99.0) |
|
|
128 | rspec-expectations (~> 2.99.0) |
|
126 | rspec-expectations (~> 2.99.0) |
|
|
129 | rspec-mocks (~> 2.99.0) |
|
127 | rspec-mocks (~> 2.99.0) |
|
|
130 |
- sass (3.4. |
|
128 | + sass (3.4.11) |
|
|
131 | sass-rails (3.2.6) |
|
129 | sass-rails (3.2.6) |
|
|
132 | railties (~> 3.2.0) |
|
130 | railties (~> 3.2.0) |
|
|
133 | sass (>= 3.1.10) |
|
131 | sass (>= 3.1.10) |
| @@ -144,8 +142,8 | |||||
|
|
144 | treetop (1.4.15) |
|
142 | treetop (1.4.15) |
|
|
145 | polyglot |
|
143 | polyglot |
|
|
146 | polyglot (>= 0.3.1) |
|
144 | polyglot (>= 0.3.1) |
|
|
147 |
- tzinfo (0.3.4 |
|
145 | + tzinfo (0.3.43) |
|
|
148 |
- uglifier (2. |
|
146 | + uglifier (2.7.0) |
|
|
149 | execjs (>= 0.3.0) |
|
147 | execjs (>= 0.3.0) |
|
|
150 | json (>= 1.8.0) |
|
148 | json (>= 1.8.0) |
|
|
151 | will_paginate (3.0.7) |
|
149 | will_paginate (3.0.7) |
| @@ -169,9 +167,8 | |||||
|
|
169 | rails (= 3.2.21) |
|
167 | rails (= 3.2.21) |
|
|
170 | rdiscount |
|
168 | rdiscount |
|
|
171 | rouge |
|
169 | rouge |
|
|
|
170 | + rspec-rails (~> 2.99.0) | ||
|
|
172 | sass-rails (~> 3.2.6) |
|
171 | sass-rails (~> 3.2.6) |
|
|
173 | - rspec-rails (~> 2.0) |
|
||
|
|
174 | - |
|
||
|
|
175 | test-unit |
|
172 | test-unit |
|
|
176 | uglifier |
|
173 | uglifier |
|
|
177 | verification! |
|
174 | verification! |
You need to be logged in to leave comments.
Login now