Moving to rails 3.2
This commit is contained in:
Dmitriy Zaporozhets
parent
cc043f32d8
commit
bc3735004c
6 changed files with 122 additions and 117 deletions
18
Gemfile
18
Gemfile
|
|
@ -1,10 +1,10 @@
|
|||
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 "carrierwave"
|
|||
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 "httparty"
|
|||
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
|
||||
|
||||
|
|
|
|||
202
Gemfile.lock
202
Gemfile.lock
|
|
@ -1,6 +1,6 @@
|
|||
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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
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();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
- 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 "TeamMembers" 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"
|
||||
|
|
|
|||
Loading…
Reference in a new issue