Download as
Browse Code »

Commit bc3735004cb45cec5e0e4fa92710897a910a5957

Authored by Dmitriy Zaporozhets
1 parent cc043f32
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Moving to rails 3.2

Showing 6 changed files with 122 additions and 117 deletions   Show diff stats
Gemfile
  Diff comments   View file @bc37350
1 1 source "http://rubygems.org"
2 2  
3   -gem "rails", "3.1.1"
  3 +gem "rails", "3.2.1"
4 4  
5 5 gem "sqlite3"
6   -gem "rake", "0.9.2.2"
7   -gem "devise", "1.5.0"
  6 +gem "rake"
  7 +gem "devise"
8 8 gem "stamp"
9 9 gem "kaminari"
10 10 gem "haml", "3.1.4"
... ... @@ -16,7 +16,7 @@ gem "carrierwave"
16 16 gem "six"
17 17 gem "therubyracer"
18 18 gem "faker"
19   -gem "seed-fu", "~> 2.1.0"
  19 +gem "seed-fu"
20 20 gem "pygments.rb", "0.2.4"
21 21 gem "thin"
22 22 gem "git"
... ... @@ -29,17 +29,17 @@ gem "httparty"
29 29 gem "charlock_holmes"
30 30 gem "foreman"
31 31 gem "omniauth-ldap"
32   -gem 'bootstrap-sass'
  32 +gem 'bootstrap-sass', "1.4.4"
33 33  
34 34 group :assets do
35   - gem "sass-rails", "~> 3.1.0"
36   - gem "coffee-rails", "~> 3.1.0"
37   - gem "uglifier"
  35 + gem "sass-rails", "3.2.3"
  36 + gem "coffee-rails", "3.2.1"
  37 + gem "uglifier", "1.0.3"
38 38 end
39 39  
40 40 group :development do
41 41 gem "letter_opener"
42   - gem "rails-footnotes", "~> 3.7.5"
  42 + gem "rails-footnotes"
43 43 gem "annotate", :git => "https://github.com/ctran/annotate_models.git"
44 44 end
45 45  
... ...
Gemfile.lock
  Diff comments   View file @bc37350
1 1 GIT
2 2 remote: https://github.com/ctran/annotate_models.git
3   - revision: fb73329243056a6d9a64878e5c543aba9b6417de
  3 + revision: a43c08f0eb4d69a48c6830630ebb60e35ccb2d2d
4 4 specs:
5 5 annotate (2.4.1.beta1)
6 6  
... ... @@ -25,46 +25,45 @@ GEM
25 25 remote: http://rubygems.org/
26 26 specs:
27 27 ZenTest (4.5.0)
28   - actionmailer (3.1.1)
29   - actionpack (= 3.1.1)
30   - mail (~> 2.3.0)
31   - actionpack (3.1.1)
32   - activemodel (= 3.1.1)
33   - activesupport (= 3.1.1)
  28 + actionmailer (3.2.1)
  29 + actionpack (= 3.2.1)
  30 + mail (~> 2.4.0)
  31 + actionpack (3.2.1)
  32 + activemodel (= 3.2.1)
  33 + activesupport (= 3.2.1)
34 34 builder (~> 3.0.0)
35 35 erubis (~> 2.7.0)
36   - i18n (~> 0.6)
37   - rack (~> 1.3.2)
  36 + journey (~> 1.0.1)
  37 + rack (~> 1.4.0)
38 38 rack-cache (~> 1.1)
39   - rack-mount (~> 0.8.2)
40 39 rack-test (~> 0.6.1)
41   - sprockets (~> 2.0.2)
42   - activemodel (3.1.1)
43   - activesupport (= 3.1.1)
  40 + sprockets (~> 2.1.2)
  41 + activemodel (3.2.1)
  42 + activesupport (= 3.2.1)
44 43 builder (~> 3.0.0)
45   - i18n (~> 0.6)
46   - activerecord (3.1.1)
47   - activemodel (= 3.1.1)
48   - activesupport (= 3.1.1)
49   - arel (~> 2.2.1)
  44 + activerecord (3.2.1)
  45 + activemodel (= 3.2.1)
  46 + activesupport (= 3.2.1)
  47 + arel (~> 3.0.0)
50 48 tzinfo (~> 0.3.29)
51   - activeresource (3.1.1)
52   - activemodel (= 3.1.1)
53   - activesupport (= 3.1.1)
54   - activesupport (3.1.1)
  49 + activeresource (3.2.1)
  50 + activemodel (= 3.2.1)
  51 + activesupport (= 3.2.1)
  52 + activesupport (3.2.1)
  53 + i18n (~> 0.6)
55 54 multi_json (~> 1.0)
56 55 acts-as-taggable-on (2.1.1)
57 56 rails
58 57 acts_as_list (0.1.4)
59 58 addressable (2.2.6)
60   - ansi (1.4.1)
  59 + ansi (1.4.2)
61 60 archive-tar-minitar (0.5.2)
62   - arel (2.2.1)
  61 + arel (3.0.0)
63 62 autotest (4.4.6)
64 63 ZenTest (>= 4.4.1)
65 64 autotest-rails (4.1.1)
66 65 ZenTest (= 4.5)
67   - awesome_print (0.4.0)
  66 + awesome_print (1.0.2)
68 67 bcrypt-ruby (3.0.1)
69 68 blankslate (2.1.2.4)
70 69 bootstrap-sass (1.4.4)
... ... @@ -80,19 +79,19 @@ GEM
80 79 carrierwave (0.5.8)
81 80 activesupport (~> 3.0)
82 81 charlock_holmes (0.6.8)
83   - childprocess (0.2.2)
  82 + childprocess (0.3.1)
84 83 ffi (~> 1.0.6)
85   - coffee-rails (3.1.1)
  84 + coffee-rails (3.2.1)
86 85 coffee-script (>= 2.2.0)
87   - railties (~> 3.1.0)
  86 + railties (~> 3.2.0.beta)
88 87 coffee-script (2.2.0)
89 88 coffee-script-source
90 89 execjs
91   - coffee-script-source (1.1.3)
92   - columnize (0.3.4)
  90 + coffee-script-source (1.2.0)
  91 + columnize (0.3.6)
93 92 crack (0.3.1)
94   - daemons (1.1.4)
95   - database_cleaner (0.7.0)
  93 + daemons (1.1.8)
  94 + database_cleaner (0.7.1)
96 95 devise (1.5.0)
97 96 bcrypt-ruby (~> 3.0)
98 97 orm_adapter (~> 0.0.3)
... ... @@ -101,13 +100,13 @@ GEM
101 100 drapper (0.8.4)
102 101 erubis (2.7.0)
103 102 eventmachine (0.12.10)
104   - execjs (1.2.9)
  103 + execjs (1.3.0)
105 104 multi_json (~> 1.0)
106 105 faker (1.0.1)
107 106 i18n (~> 0.4)
108 107 ffi (1.0.11)
109   - foreman (0.27.0)
110   - term-ansicolor (~> 1.0.5)
  108 + foreman (0.39.0)
  109 + term-ansicolor (~> 1.0.7)
111 110 thor (>= 0.13.6)
112 111 git (1.2.5)
113 112 haml (3.1.4)
... ... @@ -123,13 +122,15 @@ GEM
123 122 multi_json
124 123 multi_xml
125 124 i18n (0.6.0)
126   - jquery-rails (1.0.17)
127   - railties (~> 3.0)
  125 + journey (1.0.1)
  126 + jquery-rails (2.0.0)
  127 + railties (>= 3.2.0.beta, < 5.0)
128 128 thor (~> 0.14)
129   - json (1.6.1)
130   - json_pure (1.6.1)
131   - kaminari (0.12.4)
132   - rails (>= 3.0.0)
  129 + json (1.6.5)
  130 + kaminari (0.13.0)
  131 + actionpack (>= 3.0.0)
  132 + activesupport (>= 3.0.0)
  133 + railties (>= 3.0.0)
133 134 launchy (2.0.5)
134 135 addressable (~> 2.2.6)
135 136 letter_opener (0.0.2)
... ... @@ -137,12 +138,12 @@ GEM
137 138 libv8 (3.3.10.4)
138 139 linecache19 (0.5.12)
139 140 ruby_core_source (>= 0.1.4)
140   - mail (2.3.0)
  141 + mail (2.4.1)
141 142 i18n (>= 0.4.0)
142 143 mime-types (~> 1.16)
143 144 treetop (~> 1.4.8)
144 145 mime-types (1.17.2)
145   - multi_json (1.0.3)
  146 + multi_json (1.0.4)
146 147 multi_xml (0.4.1)
147 148 net-ldap (0.2.2)
148 149 nokogiri (1.5.0)
... ... @@ -154,43 +155,41 @@ GEM
154 155 omniauth (~> 1.0)
155 156 pyu-ruby-sasl (~> 0.0.3.1)
156 157 rubyntlm (~> 0.1.1)
157   - orm_adapter (0.0.5)
  158 + orm_adapter (0.0.6)
158 159 polyglot (0.3.3)
159 160 posix-spawn (0.3.6)
160 161 pygments.rb (0.2.4)
161 162 rubypython (~> 0.5.3)
162 163 pyu-ruby-sasl (0.0.3.3)
163   - rack (1.3.5)
  164 + rack (1.4.1)
164 165 rack-cache (1.1)
165 166 rack (>= 0.4)
166   - rack-mount (0.8.3)
167   - rack (>= 1.0.0)
168   - rack-protection (1.1.4)
  167 + rack-protection (1.2.0)
169 168 rack
170 169 rack-ssl (1.3.2)
171 170 rack
172 171 rack-test (0.6.1)
173 172 rack (>= 1.0)
174   - rails (3.1.1)
175   - actionmailer (= 3.1.1)
176   - actionpack (= 3.1.1)
177   - activerecord (= 3.1.1)
178   - activeresource (= 3.1.1)
179   - activesupport (= 3.1.1)
  173 + rails (3.2.1)
  174 + actionmailer (= 3.2.1)
  175 + actionpack (= 3.2.1)
  176 + activerecord (= 3.2.1)
  177 + activeresource (= 3.2.1)
  178 + activesupport (= 3.2.1)
180 179 bundler (~> 1.0)
181   - railties (= 3.1.1)
  180 + railties (= 3.2.1)
182 181 rails-footnotes (3.7.5)
183 182 rails (>= 3.0.0)
184   - railties (3.1.1)
185   - actionpack (= 3.1.1)
186   - activesupport (= 3.1.1)
  183 + railties (3.2.1)
  184 + actionpack (= 3.2.1)
  185 + activesupport (= 3.2.1)
187 186 rack-ssl (~> 1.3.2)
188 187 rake (>= 0.8.7)
189 188 rdoc (~> 3.4)
190 189 thor (~> 0.14.6)
191 190 rake (0.9.2.2)
192 191 rdiscount (1.6.8)
193   - rdoc (3.11)
  192 + rdoc (3.12)
194 193 json (~> 1.4)
195 194 redis (2.2.2)
196 195 redis-namespace (1.0.3)
... ... @@ -200,19 +199,19 @@ GEM
200 199 redis-namespace (~> 1.0.2)
201 200 sinatra (>= 0.9.2)
202 201 vegas (~> 0.1.2)
203   - rspec (2.7.0)
204   - rspec-core (~> 2.7.0)
205   - rspec-expectations (~> 2.7.0)
206   - rspec-mocks (~> 2.7.0)
207   - rspec-core (2.7.1)
208   - rspec-expectations (2.7.0)
  202 + rspec (2.8.0)
  203 + rspec-core (~> 2.8.0)
  204 + rspec-expectations (~> 2.8.0)
  205 + rspec-mocks (~> 2.8.0)
  206 + rspec-core (2.8.0)
  207 + rspec-expectations (2.8.0)
209 208 diff-lcs (~> 1.1.2)
210   - rspec-mocks (2.7.0)
211   - rspec-rails (2.7.0)
212   - actionpack (~> 3.0)
213   - activesupport (~> 3.0)
214   - railties (~> 3.0)
215   - rspec (~> 2.7.0)
  209 + rspec-mocks (2.8.0)
  210 + rspec-rails (2.8.1)
  211 + actionpack (>= 3.0)
  212 + activesupport (>= 3.0)
  213 + railties (>= 3.0)
  214 + rspec (~> 2.8.0)
216 215 ruby-debug-base19 (0.11.25)
217 216 columnize (>= 0.3.1)
218 217 linecache19 (>= 0.5.11)
... ... @@ -227,20 +226,19 @@ GEM
227 226 rubypython (0.5.3)
228 227 blankslate (>= 2.1.2.3)
229 228 ffi (~> 1.0.7)
230   - rubyzip (0.9.4)
231   - sass (3.1.12)
232   - sass-rails (3.1.5)
233   - actionpack (~> 3.1.0)
234   - railties (~> 3.1.0)
235   - sass (~> 3.1.10)
236   - tilt (~> 1.3.2)
237   - seed-fu (2.1.0)
238   - activerecord (~> 3.1.0)
239   - activesupport (~> 3.1.0)
240   - selenium-webdriver (2.12.2)
241   - childprocess (>= 0.2.1)
  229 + rubyzip (0.9.6.1)
  230 + sass (3.1.15)
  231 + sass-rails (3.2.3)
  232 + railties (~> 3.2.0.beta)
  233 + sass (>= 3.1.10)
  234 + tilt (~> 1.3)
  235 + seed-fu (2.2.0)
  236 + activerecord (~> 3.1)
  237 + activesupport (~> 3.1)
  238 + selenium-webdriver (2.19.0)
  239 + childprocess (>= 0.2.5)
242 240 ffi (~> 1.0.9)
243   - json_pure
  241 + multi_json (~> 1.0.4)
244 242 rubyzip
245 243 shoulda (3.0.0.beta2)
246 244 shoulda-context (~> 1.0.0.beta1)
... ... @@ -251,16 +249,16 @@ GEM
251 249 multi_json (~> 1.0.3)
252 250 simplecov-html (~> 0.5.3)
253 251 simplecov-html (0.5.3)
254   - sinatra (1.3.1)
255   - rack (~> 1.3, >= 1.3.4)
256   - rack-protection (~> 1.1, >= 1.1.2)
  252 + sinatra (1.3.2)
  253 + rack (~> 1.3, >= 1.3.6)
  254 + rack-protection (~> 1.2)
257 255 tilt (~> 1.3, >= 1.3.3)
258 256 six (0.2.0)
259   - sprockets (2.0.3)
  257 + sprockets (2.1.2)
260 258 hike (~> 1.2)
261 259 rack (~> 1.0)
262 260 tilt (~> 1.1, != 1.3.0)
263   - sqlite3 (1.3.4)
  261 + sqlite3 (1.3.5)
264 262 stamp (0.1.6)
265 263 term-ansicolor (1.0.7)
266 264 therubyracer (0.9.9)
... ... @@ -274,17 +272,17 @@ GEM
274 272 treetop (1.4.10)
275 273 polyglot
276 274 polyglot (>= 0.3.1)
277   - turn (0.8.3)
  275 + turn (0.9.2)
278 276 ansi
279 277 tzinfo (0.3.31)
280   - uglifier (1.1.0)
  278 + uglifier (1.0.3)
281 279 execjs (>= 0.3.0)
282 280 multi_json (>= 1.0.2)
283   - vegas (0.1.8)
  281 + vegas (0.1.11)
284 282 rack (>= 1.0.0)
285 283 warden (1.1.0)
286 284 rack (>= 1.0)
287   - webmock (1.7.8)
  285 + webmock (1.7.10)
288 286 addressable (~> 2.2, > 2.2.5)
289 287 crack (>= 0.1.7)
290 288 xpath (0.1.4)
... ... @@ -300,13 +298,13 @@ DEPENDENCIES
300 298 autotest
301 299 autotest-rails
302 300 awesome_print
303   - bootstrap-sass
  301 + bootstrap-sass (= 1.4.4)
304 302 capybara
305 303 carrierwave
306 304 charlock_holmes
307   - coffee-rails (~> 3.1.0)
  305 + coffee-rails (= 3.2.1)
308 306 database_cleaner
309   - devise (= 1.5.0)
  307 + devise
310 308 drapper
311 309 faker
312 310 foreman
... ... @@ -322,15 +320,15 @@ DEPENDENCIES
322 320 letter_opener
323 321 omniauth-ldap
324 322 pygments.rb (= 0.2.4)
325   - rails (= 3.1.1)
326   - rails-footnotes (~> 3.7.5)
327   - rake (= 0.9.2.2)
  323 + rails (= 3.2.1)
  324 + rails-footnotes
  325 + rake
328 326 rdiscount
329 327 resque
330 328 rspec-rails
331 329 ruby-debug19
332   - sass-rails (~> 3.1.0)
333   - seed-fu (~> 2.1.0)
  330 + sass-rails (= 3.2.3)
  331 + seed-fu
334 332 shoulda (~> 3.0.0.beta2)
335 333 simplecov
336 334 six
... ... @@ -339,5 +337,5 @@ DEPENDENCIES
339 337 therubyracer
340 338 thin
341 339 turn
342   - uglifier
  340 + uglifier (= 1.0.3)
343 341 webmock
... ...
app/assets/javascripts/team.js
  Diff comments   View file @bc37350
1 1 function backToMembers(){
2   - $("#team_member_new").hide("slide", { direction: "right" }, 150, function(){
  2 + $("#new_team_member").hide("slide", { direction: "right" }, 150, function(){
3 3 $("#team-table").show("slide", { direction: "left" }, 150, function() {
4   - $("#team_member_new").remove();
  4 + $("#new_team_member").remove();
5 5 $(".add_new").show();
6 6 });
7 7 });
... ...
app/views/team_members/create.js.haml
  Diff comments   View file @bc37350
1 1 - if @team_member.valid?
2 2 :plain
3   - $("#team_member_new").hide("slide", { direction: "right" }, 150, function(){
  3 + $("#new_team_member").hide("slide", { direction: "right" }, 150, function(){
4 4 $("#team-table").show("slide", { direction: "left" }, 150, function() {
5   - $("#team_member_new").remove();
  5 + $("#new_team_member").remove();
6 6 $("#team-table").replaceWith("#{escape_javascript(render('projects/team'))}");
7 7 $(".add_new").show();
8 8 });
9 9 });
10 10 - else
11 11 :plain
12   - $("#team_member_new").replaceWith("#{escape_javascript(render('form'))}");
  12 + $("#new_team_member").replaceWith("#{escape_javascript(render('form'))}");
13 13 $('select#team_member_user_id').chosen();
... ...
config/environments/development.rb
  Diff comments   View file @bc37350
... ... @@ -30,4 +30,11 @@ Gitlab::Application.configure do
30 30  
31 31 config.action_mailer.default_url_options = { :host => 'localhost:3000' }
32 32 config.action_mailer.delivery_method = :letter_opener
  33 +
  34 + # Raise exception on mass assignment protection for Active Record models
  35 + config.active_record.mass_assignment_sanitizer = :strict
  36 +
  37 + # Log the query plan for queries taking more than this (works
  38 + # with SQLite, MySQL, and PostgreSQL)
  39 + config.active_record.auto_explain_threshold_in_seconds = 0.5
33 40 end
... ...
spec/requests/team_members_spec.rb
  Diff comments   View file @bc37350
... ... @@ -29,7 +29,7 @@ describe &quot;TeamMembers&quot; do
29 29  
30 30 describe "fill in" do
31 31 before do
32   - within "#team_member_new" do
  32 + within "#new_team_member" do
33 33 select @user_1.name, :from => "team_member_user_id"
34 34 select "Report", :from => "team_member_project_access"
35 35 select "Pull", :from => "team_member_repo_access"
... ...