Moving to rails 3.2

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