Reset Gemfile.lock

pull/1435/head
Marek Takac 11 years ago
parent 5d6618eea4
commit 8b2fe0b01e
  1. 169
      Gemfile.lock
  2. 1
      lib/plugins/acts_as_journalized/lib/redmine/acts/journalized/save_hooks.rb

@ -76,7 +76,7 @@ GEM
activesupport (= 3.2.18)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activerecord-tableless (1.3.4)
activerecord-tableless (1.3.3)
activerecord (>= 2.3.0)
activeresource (3.2.18)
activemodel (= 3.2.18)
@ -86,7 +86,7 @@ GEM
multi_json (~> 1.0)
acts_as_list (0.2.0)
activerecord (>= 3.0)
addressable (2.3.6)
addressable (2.3.4)
arel (3.0.3)
awesome_nested_set (2.1.6)
activerecord (>= 3.0.0)
@ -96,30 +96,31 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bourbon (4.0.2)
bourbon (4.0.0)
sass (~> 3.3)
thor
bourne (1.4.0)
mocha (~> 0.13.2)
builder (3.0.4)
byebug (2.7.0)
columnize (~> 0.3)
debugger-linecache (~> 1.2)
capybara (2.3.0)
capybara (2.2.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-screenshot (0.3.19)
capybara-screenshot (0.3.6)
capybara (>= 1.0, < 3)
launchy
childprocess (0.5.3)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.3.1)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.4)
climate_control (>= 0.0.3, < 1.0)
codeclimate-test-reporter (0.3.0)
codeclimate-test-reporter (0.1.1)
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.0.9)
coercible (1.0.0)
@ -138,23 +139,22 @@ GEM
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.4)
sass (>= 3.2, < 3.5)
cucumber (1.3.15)
cucumber (1.3.8)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
gherkin (~> 2.12.1)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.1)
cucumber-rails (1.4.1)
capybara (>= 1.1.2, < 3)
cucumber (>= 1.3.8, < 2)
mime-types (~> 1.16)
nokogiri (~> 1.5)
rails (>= 3, < 5)
multi_test (>= 0.0.2)
cucumber-rails (1.3.1)
capybara (>= 1.1.2)
cucumber (>= 1.2.0)
nokogiri (>= 1.5.0)
rails (~> 3.0)
cucumber-rails-training-wheels (1.0.0)
cucumber-rails (>= 1.1.1)
daemons (1.1.9)
dalli (2.7.2)
database_cleaner (1.3.0)
dalli (2.6.4)
database_cleaner (1.0.1)
date_validator (0.7.0)
activemodel (>= 3)
debug_inspector (0.0.2)
@ -173,21 +173,23 @@ GEM
equalizer (0.0.9)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.1.0)
factory_girl (4.4.0)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
faker (1.3.0)
faker (1.2.0)
i18n (~> 0.5)
ffi (1.9.3)
gherkin (2.12.2)
multi_json (~> 1.3)
globalize (3.1.0)
activemodel (>= 3.1.0, < 4.0.0)
activerecord (>= 3.1.0, < 4.0.0)
gon (4.1.1)
globalize (3.0.0)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
paper_trail (~> 2)
gon (4.0.0)
actionpack (>= 2.3.0)
json
grape (0.7.0)
@ -200,13 +202,13 @@ GEM
rack-accept
rack-mount
virtus (>= 1.0.0)
hashie (2.1.1)
hashie (2.0.5)
hike (1.2.3)
hooks (0.3.3)
htmldiff (0.0.1)
i18n (0.6.9)
ice_nine (0.11.0)
interception (0.5)
interception (0.3)
journey (1.0.4)
json (1.8.1)
json_spec (1.1.1)
@ -216,12 +218,12 @@ GEM
addressable (~> 2.3)
letter_opener (1.0.0)
launchy (>= 2.0.4)
libv8 (3.16.14.3)
libv8 (3.11.8.17)
listen (1.1.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
livingstyleguide (1.0.5)
livingstyleguide (1.0.4)
compass
hooks (= 0.3.3)
minisyntax
@ -232,25 +234,29 @@ GEM
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.6.0)
minisyntax (0.2.3)
multi_json (1.10.1)
multi_test (0.1.1)
mocha (0.13.3)
metaclass (~> 0.0.1)
multi_json (1.9.3)
multi_test (0.0.2)
multi_xml (0.5.5)
mysql2 (0.3.16)
mysql2 (0.3.11)
net-ldap (0.2.2)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
nokogiri (1.5.11)
non-stupid-digest-assets (1.0.4)
object-daddy (1.1.1)
oj (2.9.4)
oj (2.1.6)
omniauth (1.2.1)
hashie (>= 1.2, < 3)
rack (~> 1.0)
paper_trail (2.7.2)
activerecord (~> 3.0)
railties (~> 3.0)
pg (0.17.1)
polyglot (0.3.5)
polyglot (0.3.3)
prototype-rails (3.2.1)
rails (~> 3.2)
pry (0.9.12.6)
@ -260,13 +266,13 @@ GEM
pry-byebug (1.3.2)
byebug (~> 2.7)
pry (~> 0.9.12)
pry-doc (0.6.0)
pry (~> 0.9)
yard (~> 0.8)
pry-doc (0.4.6)
pry (>= 0.9)
yard (>= 0.8)
pry-rails (0.3.2)
pry (>= 0.9.10)
pry-rescue (1.4.1)
interception (>= 0.5)
pry-rescue (1.1.1)
interception (>= 0.3)
pry
pry-stack_explorer (0.4.9.1)
binding_of_caller (>= 0.7)
@ -302,7 +308,7 @@ GEM
rails-dev-tweaks (0.6.1)
actionpack (~> 3.1)
railties (~> 3.1)
rails_autolink (1.1.5)
rails_autolink (1.1.0)
rails (> 3.1)
railties (3.2.18)
actionpack (= 3.2.18)
@ -311,13 +317,13 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.3.2)
rake (10.3.1)
rb-fsevent (0.9.4)
rb-inotify (0.9.4)
ffi (>= 0.5.0)
rb-kqueue (0.2.2)
ffi (>= 0.5.0)
rb-readline (0.5.1)
rb-readline (0.5.0)
rdoc (3.12.2)
json (~> 1.4)
redcarpet (3.0.0)
@ -330,43 +336,41 @@ GEM
request_store (1.0.5)
roar (0.12.7)
representable (>= 1.6.0)
rspec (2.99.0)
rspec-core (~> 2.99.0)
rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.99.0)
rspec-collection_matchers (0.0.4)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (2.99.0)
rspec-expectations (2.99.0)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.99.0)
rspec-rails (2.99.0)
rspec-mocks (2.14.6)
rspec-rails (2.14.2)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-collection_matchers
rspec-core (~> 2.99.0)
rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.99.0)
ruby-prof (0.15.1)
ruby-progressbar (1.5.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
ruby-prof (0.13.0)
ruby-progressbar (1.2.0)
rubytree (0.8.3)
json (>= 1.7.5)
structured_warnings (>= 0.1.3)
rubyzip (1.1.4)
sass (3.3.8)
selenium-webdriver (2.42.0)
childprocess (>= 0.5.0)
rubyzip (1.1.0)
sass (3.3.7)
selenium-webdriver (2.39.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
rubyzip
websocket (~> 1.0.4)
shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0)
shoulda-context (1.2.1)
shoulda-matchers (2.6.1)
shoulda-context (1.1.2)
shoulda-matchers (2.1.0)
activesupport (>= 3.0.0)
bourne (~> 1.3)
simplecov (0.8.0.pre)
multi_json
simplecov-html (~> 0.7.1)
@ -381,35 +385,34 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.2.2.backport2)
sqlite3 (1.3.9)
strong_parameters (0.2.3)
sqlite3 (1.3.7)
strong_parameters (0.2.1)
actionpack (~> 3.0)
activemodel (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
structured_warnings (0.1.4)
svg-graph (1.0.5)
syck (1.0.1)
test-unit (2.5.5)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
thin (1.6.2)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
timecop (0.6.3)
timecop (0.6.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.39)
tzinfo (0.3.38)
uber (0.0.6)
uglifier (2.5.0)
uglifier (2.1.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
multi_json (~> 1.0, >= 1.0.2)
virtus (1.0.2)
axiom-types (~> 0.1)
coercible (~> 1.0)
@ -419,7 +422,7 @@ GEM
will_paginate (3.0.5)
xpath (2.0.0)
nokogiri (~> 1.3)
yard (0.8.7.4)
yard (0.8.7.2)
PLATFORMS
ruby

@ -69,6 +69,7 @@ module Redmine::Acts::Journalized
JournalManager.add_journal self, @journal_user, @journal_notes if add_journal
journals.select { |j| j.new_record? }.each { |j| j.save! }
# journals.select { |j| j.new_record? }.each { |j| binding.pry }
@journal_user = nil
@journal_notes = nil

Loading…
Cancel
Save