null+****@clear*****
null+****@clear*****
Thu Jul 12 20:15:16 JST 2012
SUZUKI Miho 2012-07-12 20:15:16 +0900 (Thu, 12 Jul 2012) New Revision: f216ff7aed013b46da0b896c84b2ebe9acb09068 https://github.com/logaling/logaling-server/commit/f216ff7aed013b46da0b896c84b2ebe9acb09068 Merged ba9eeff: Merge pull request #5 from logaling/show-terms-of-glossary Log: Use latest logaling-command Modified files: Gemfile Gemfile.lock Modified: Gemfile (+1 -1) =================================================================== --- Gemfile 2012-07-12 19:12:13 +0900 (a8928ac) +++ Gemfile 2012-07-12 20:15:16 +0900 (12a1c11) @@ -39,7 +39,7 @@ gem 'haml-rails' # To use debugger # gem 'ruby-debug19', :require => 'ruby-debug' -gem 'logaling-command', :git => 'git://github.com/logaling/logaling-command.git', :require => 'logaling', :ref => 'b6be24a2072aa5344a659596920715833d85bc08' #TODO: use latest logaling-command +gem 'logaling-command', :git => 'git://github.com/logaling/logaling-command.git', :require => 'logaling' group :development, :test do gem 'rspec-rails' Modified: Gemfile.lock (+13 -14) =================================================================== --- Gemfile.lock 2012-07-12 19:12:13 +0900 (5ea217f) +++ Gemfile.lock 2012-07-12 20:15:16 +0900 (56a4114) @@ -1,7 +1,6 @@ GIT remote: git://github.com/logaling/logaling-command.git - revision: b6be24a2072aa5344a659596920715833d85bc08 - ref: b6be24a2072aa5344a659596920715833d85bc08 + revision: cd772a96d6faebc998fa38c5d4316fe9c965f950 specs: logaling-command (0.1.6) activesupport @@ -79,7 +78,7 @@ GEM io-like (0.3.0) journey (1.0.4) jquery-rails (2.0.2) - railties (< 5.0, >= 3.2.0) + railties (>= 3.2.0, < 5.0) thor (~> 0.14) json (1.7.3) less (2.2.1) @@ -120,7 +119,7 @@ GEM rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (< 2.0, >= 0.14.6) + thor (>= 0.14.6, < 2.0) rainbow (1.1.4) rake (0.9.2.2) rdoc (3.12) @@ -129,19 +128,19 @@ GEM archive-zip json pkg-config - rspec (2.10.0) - rspec-core (~> 2.10.0) - rspec-expectations (~> 2.10.0) - rspec-mocks (~> 2.10.0) - rspec-core (2.10.1) - rspec-expectations (2.10.0) + rspec (2.11.0) + rspec-core (~> 2.11.0) + rspec-expectations (~> 2.11.0) + rspec-mocks (~> 2.11.0) + rspec-core (2.11.0) + rspec-expectations (2.11.1) diff-lcs (~> 1.1.3) - rspec-mocks (2.10.1) - rspec-rails (2.10.1) + rspec-mocks (2.11.1) + rspec-rails (2.11.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.10.0) + rspec (~> 2.11.0) rubyzip (0.9.9) sass (3.1.20) sass-rails (3.2.5) @@ -156,7 +155,7 @@ GEM sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) + tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) therubyracer (0.10.1) libv8 (~> 3.3.10) -------------- next part -------------- An HTML attachment was scrubbed...다운로드
