Mercurial Mercurial > hg > jv-calipel / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update gems
authorMarcel Hlopko <marcel@hlopko.com>
Wed, 29 Oct 2014 21:07:41 +0100
changeset 239 33b6b56411aa
parent 238 6ec4c90dfc1a
child 240 e28010b85053
Update gems
web/Gemfile file | annotate | diff | comparison | revisions
web/Gemfile.lock file | annotate | diff | comparison | revisions 
--- a/web/Gemfile	Tue Oct 28 19:07:38 2014 +0100
+++ b/web/Gemfile	Wed Oct 29 21:07:41 2014 +0100
@@ -1,40 +1,40 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.0"
-gem "sqlite3", "~> 1.3.7"
-gem "jbuilder", "~> 1.0.2"
-gem "sass-rails", "~> 4.0.0.rc2"
-gem "less-rails", "~> 2.3.3"
-gem "uglifier", "~> 2.1.1"
-gem "therubyracer", "~> 0.11.4", platforms: "ruby"
-gem "jquery-rails", "~> 3.0.1"
-gem "jquery-ui-rails", "~> 4.0.3"
-gem "twitter-bootstrap-rails", "~> 2.2.7"
-gem "turbolinks", "~> 1.2.0"
+gem "rails"
+gem "sqlite3"
+gem "jbuilder"
+gem "less-rails"
+gem "uglifier"
+gem "therubyracer", platforms: "ruby"
+gem "jquery-rails"
+gem "jquery-ui-rails"
+gem "coffee-rails"
+gem "twitter-bootstrap-rails", "~> 3"
+gem "turbolinks"
 gem "rickshaw_rails", git: "https://github.com/mhlopko/rickshaw_rails.git"
-gem "dotenv-rails", "~> 0.8.0"
+gem "dotenv-rails"
 gem "exception_notification",
   git: "https://github.com/smartinez87/exception_notification.git"
 gem "rack-mini-profiler"
 gem "flamegraph"
 gem "handlers-js"
 gem "quiet_assets"
+gem "simple_form"
 
 group :development do
-  gem "capistrano", "~> 2.15.4"
-  gem "rvm-capistrano", "~> 1.3.1"
-  gem "pry", "~> 0.9.12.2"
+  gem "capistrano", "~> 2.15"
+  gem "rvm-capistrano", "~> 1.3"
+  gem "pry", "~> 0.9"
   gem "byebug"
   gem "pry-byebug"
-  gem "rails-erd", "~> 1.1.0"
-  gem "annotate", "~> 2.5.0"
+  gem "annotate"
   gem "bullet"
 end
 
 group :test do
-  gem "rspec-rails", "~> 2.13.2"
+  gem "rspec-rails"
 end
 
 group :doc do
-  gem "sdoc", "~> 0.3.20", {:require=>false}
+  gem "sdoc", {:require=>false}
 end
--- a/web/Gemfile.lock	Tue Oct 28 19:07:38 2014 +0100
+++ b/web/Gemfile.lock	Wed Oct 29 21:07:41 2014 +0100
@@ -7,120 +7,120 @@
 
 GIT
   remote: https://github.com/smartinez87/exception_notification.git
-  revision: 5d5f035effb8002fe9f3175c184df026b8614044
+  revision: 5706b9d38dcf3109ae6bb032b21bd248ea459842
   specs:
-    exception_notification (4.0.0)
+    exception_notification (4.1.0.rc1)
       actionmailer (>= 3.0.4)
       activesupport (>= 3.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionmailer (4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.6)
+      actionview (= 4.1.6)
+      activesupport (= 4.1.6)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+    activerecord (4.1.6)
+      activemodel (= 4.1.6)
+      activesupport (= 4.1.6)
+      arel (~> 5.0.0)
+    activesupport (4.1.6)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    annotate (2.5.0)
-      rake
-    arel (4.0.0)
-    atomic (1.1.13)
-    builder (3.1.4)
-    bullet (4.13.2)
+      tzinfo (~> 1.1)
+    annotate (2.6.5)
+      activerecord (>= 2.3.0)
+      rake (>= 0.8.7)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    bullet (4.14.0)
       activesupport (>= 3.0.0)
       uniform_notifier (>= 1.6.0)
-    byebug (2.7.0)
-      columnize (~> 0.3)
+    byebug (3.5.1)
+      columnize (~> 0.8)
       debugger-linecache (~> 1.2)
+      slop (~> 3.6)
     capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    choice (0.1.6)
-    coderay (1.0.9)
-    coffee-rails (4.0.0)
+    coderay (1.1.0)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0.beta, < 5.0)
-    coffee-script (2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
-    columnize (0.3.6)
-    commonjs (0.2.6)
+    coffee-script-source (1.8.0)
+    columnize (0.8.9)
+    commonjs (0.2.7)
     debugger-linecache (1.2.0)
-    diff-lcs (1.2.4)
-    dotenv (0.8.0)
-    dotenv-rails (0.8.0)
-      dotenv (= 0.8.0)
+    diff-lcs (1.2.5)
+    dotenv (1.0.2)
+    dotenv-rails (1.0.2)
+      dotenv (= 1.0.2)
     erubis (2.7.0)
-    execjs (2.0.1)
+    execjs (2.2.2)
     fast_stack (0.1.0)
       rake
       rake-compiler
     flamegraph (0.0.5)
       fast_stack
     handlers-js (0.0.1)
-    highline (1.6.19)
+    highline (1.6.21)
     hike (1.2.3)
-    i18n (0.6.5)
-    jbuilder (1.0.2)
-      activesupport (>= 3.0.0)
-    jquery-rails (3.0.4)
+    i18n (0.6.11)
+    jbuilder (2.2.4)
+      activesupport (>= 3.0.0, < 5)
+      multi_json (~> 1.2)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.0.4)
-      jquery-rails
-      railties (>= 3.1.0)
-    json (1.8.0)
-    less (2.3.2)
-      commonjs (~> 0.2.6)
-    less-rails (2.3.3)
+    jquery-ui-rails (5.0.2)
+      railties (>= 3.2.16)
+    json (1.8.1)
+    less (2.5.1)
+      commonjs (~> 0.2.7)
+    less-rails (2.5.0)
       actionpack (>= 3.1)
-      less (~> 2.3.1)
-    libv8 (3.11.8.17)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+      less (~> 2.5.0)
+    libv8 (3.16.14.7)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (1.24)
-    minitest (4.7.5)
-    multi_json (1.7.9)
-    net-scp (1.1.2)
+    mime-types (2.4.3)
+    minitest (5.4.2)
+    multi_json (1.10.1)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
+    net-ssh (2.9.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    polyglot (0.3.3)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (1.3.2)
-      byebug (~> 2.7)
-      pry (~> 0.9.12)
+    pry-byebug (2.0.0)
+      byebug (~> 3.4)
+      pry (~> 0.10)
     quiet_assets (1.0.3)
       railties (>= 3.1, < 5.0)
     rack (1.5.2)
@@ -128,115 +128,111 @@
       rack (>= 1.1.3)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (4.1.6)
+      actionmailer (= 4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
+      activemodel (= 4.1.6)
+      activerecord (= 4.1.6)
+      activesupport (= 4.1.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
-      sprockets-rails (~> 2.0.0)
-    rails-erd (1.1.0)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
-      choice (~> 0.1.6)
-      ruby-graphviz (~> 1.0.4)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+      railties (= 4.1.6)
+      sprockets-rails (~> 2.0)
+    railties (4.1.6)
+      actionpack (= 4.1.6)
+      activesupport (= 4.1.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
+    rake (10.3.2)
     rake-compiler (0.9.3)
       rake
-    rdoc (3.12.2)
+    rdoc (4.1.2)
       json (~> 1.4)
     ref (1.0.5)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-rails (2.13.2)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-rails (3.1.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    ruby-graphviz (1.0.9)
-    rvm-capistrano (1.3.4)
-      capistrano (>= 2.0.0)
-    sass (3.2.10)
-    sass-rails (4.0.0)
-      railties (>= 4.0.0.beta, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
-    slop (3.4.6)
-    sprockets (2.10.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rvm-capistrano (1.5.4)
+      capistrano (~> 2.15.4)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    simple_form (3.0.2)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
+    slop (3.6.0)
+    sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
+    sprockets-rails (2.2.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.8)
-    therubyracer (0.11.4)
-      libv8 (~> 3.11.8.12)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.9)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
       ref
-    thor (0.18.1)
-    thread_safe (0.1.2)
-      atomic
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    turbolinks (1.2.0)
+    turbolinks (2.5.1)
       coffee-rails
-    twitter-bootstrap-rails (2.2.8)
-      actionpack (>= 3.1)
-      execjs
-      rails (>= 3.1)
-      railties (>= 3.1)
-    tzinfo (0.3.37)
-    uglifier (2.1.2)
+    twitter-bootstrap-rails (3.2.0)
+      actionpack (~> 4.1)
+      execjs (~> 2.2)
+      rails (~> 4.1)
+      railties (~> 4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
     uniform_notifier (1.6.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  annotate (~> 2.5.0)
+  annotate
   bullet
   byebug
-  capistrano (~> 2.15.4)
-  dotenv-rails (~> 0.8.0)
+  capistrano (~> 2.15)
+  coffee-rails
+  dotenv-rails
   exception_notification!
   flamegraph
   handlers-js
-  jbuilder (~> 1.0.2)
-  jquery-rails (~> 3.0.1)
-  jquery-ui-rails (~> 4.0.3)
-  less-rails (~> 2.3.3)
-  pry (~> 0.9.12.2)
+  jbuilder
+  jquery-rails
+  jquery-ui-rails
+  less-rails
+  pry (~> 0.9)
   pry-byebug
   quiet_assets
   rack-mini-profiler
-  rails (~> 4.0.0)
-  rails-erd (~> 1.1.0)
+  rails
   rickshaw_rails!
-  rspec-rails (~> 2.13.2)
-  rvm-capistrano (~> 1.3.1)
-  sass-rails (~> 4.0.0.rc2)
-  sdoc (~> 0.3.20)
-  sqlite3 (~> 1.3.7)
-  therubyracer (~> 0.11.4)
-  turbolinks (~> 1.2.0)
-  twitter-bootstrap-rails (~> 2.2.7)
-  uglifier (~> 2.1.1)
+  rspec-rails
+  rvm-capistrano (~> 1.3)
+  sdoc
+  simple_form
+  sqlite3
+  therubyracer
+  turbolinks
+  twitter-bootstrap-rails (~> 3)
+  uglifier
hg/jv-calipel