Update all gems!

diff --git a/Gemfile b/Gemfile
index 044f79a..a231724 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -36,11 +36,11 @@ gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
 gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'
 
 # Language detection
-gem "github-linguist", "~> 2.3.4" , require: "linguist"
+gem "github-linguist", require: "linguist"
 
 # API
-gem "grape", "~> 0.3.1"
-gem "grape-entity", "~> 0.2.0"
+gem "grape"
+gem "grape-entity"
 
 # Format dates and times
 # based on human-friendly examples
@@ -71,13 +71,13 @@ gem "redcarpet",     "~> 2.2.2"
 gem "github-markup", "~> 0.7.4", require: 'github/markup'
 
 # Servers
-gem "puma", '~> 2.0.0.b7'
+gem "puma", '~> 2.0.1'
 
 # State machine
 gem "state_machine"
 
 # Issue tags
-gem "acts-as-taggable-on", "2.3.3"
+gem "acts-as-taggable-on"
 
 # Background jobs
 gem 'slim'
@@ -103,9 +103,9 @@ gem "foreman"
 gem "redis-rails"
 
 group :assets do
-  gem "sass-rails",   "~> 3.2.5"
-  gem "coffee-rails", "~> 3.2.2"
-  gem "uglifier",     "~> 1.3.0"
+  gem "sass-rails"
+  gem "coffee-rails"
+  gem "uglifier"
   gem "therubyracer"
   gem 'turbolinks'
   gem 'jquery-turbolinks'

diff --git a/Gemfile.lock b/Gemfile.lock
index bd52995..a6c2b6a 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/ctran/annotate_models.git
-  revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e
+  revision: 8bd159c7a484093fde84beaa9e6398f25ddacf09
   specs:
     annotate (2.6.0.beta1)
       activerecord (>= 2.3.0)
@@ -62,16 +62,16 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    acts-as-taggable-on (2.3.3)
+    acts-as-taggable-on (2.4.0)
       rails (~> 3.0)
-    addressable (2.3.2)
+    addressable (2.3.4)
     arel (3.0.2)
     awesome_print (1.1.0)
     backports (2.6.7)
     bcrypt-ruby (3.0.1)
-    better_errors (0.3.2)
+    better_errors (0.8.0)
       coderay (>= 1.0.0)
-      erubis (>= 2.7.0)
+      erubis (>= 2.6.6)
     binding_of_caller (0.7.1)
       debug_inspector (>= 0.0.1)
     bootstrap-sass (2.2.1.1)
@@ -86,10 +86,9 @@ GEM
     carrierwave (0.8.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
-    celluloid (0.12.4)
-      facter (>= 1.6.12)
+    celluloid (0.13.0)
       timers (>= 1.0.0)
-    charlock_holmes (0.6.9)
+    charlock_holmes (0.6.9.4)
     chosen-rails (0.9.8)
       railties (~> 3.0)
       thor (~> 0.14)
@@ -102,11 +101,11 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
+    coffee-script-source (1.6.2)
     colored (1.2)
     colorize (0.5.8)
     connection_pool (1.0.0)
-    coveralls (0.6.2)
+    coveralls (0.6.7)
       colorize
       multi_json (~> 1.3)
       rest-client
@@ -122,7 +121,8 @@ GEM
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
-    diff-lcs (1.2.1)
+    diff-lcs (1.2.4)
+    dotenv (0.7.0)
     email_spec (1.4.0)
       launchy (~> 2.1)
       mail (~> 2.2)
@@ -130,28 +130,29 @@ GEM
       activesupport (>= 3.2)
     erubis (2.7.0)
     escape_utils (0.2.4)
-    eventmachine (1.0.0)
+    eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    facter (1.6.18)
-    factory_girl (4.1.0)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.1.0)
-      factory_girl (~> 4.1.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
-    faraday (0.8.6)
+    faraday (0.8.7)
       multipart-post (~> 1.1)
     faye-websocket (0.4.7)
       eventmachine (>= 0.12.0)
-    ffaker (1.15.0)
-    ffi (1.6.0)
+    ffaker (1.16.0)
+    ffi (1.8.1)
     font-awesome-sass-rails (3.0.2.2)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
-    foreman (0.62.0)
+    foreman (0.63.0)
+      dotenv (>= 0.7)
       thor (>= 0.13.6)
+    formatador (0.2.4)
     gemoji (1.2.1)
-    gherkin-ruby (0.2.1)
+    gherkin-ruby (0.3.0)
     github-linguist (2.3.4)
       charlock_holmes (~> 0.6.6)
       escape_utils (~> 0.2.3)
@@ -183,46 +184,48 @@ GEM
       pygments.rb (~> 0.4.2)
       sanitize (~> 2.0.3)
       stringex (~> 1.5.1)
-    gon (4.0.2)
-    grape (0.3.2)
+    gon (4.1.0)
+      actionpack (>= 2.3.0)
+      json
+    grape (0.4.1)
       activesupport
       builder
       hashie (>= 1.2.0)
       multi_json (>= 1.3.2)
       multi_xml (>= 0.5.2)
-      rack
+      rack (>= 1.3.0)
       rack-accept
       rack-mount
       virtus
-    grape-entity (0.2.0)
+    grape-entity (0.3.0)
       activesupport
       multi_json (>= 1.3.2)
     grit_ext (0.8.1)
       charlock_holmes (~> 0.6.9)
     growl (1.0.3)
-    guard (1.6.2)
-      listen (>= 0.6.0)
+    guard (1.8.0)
+      formatador (>= 0.2.4)
+      listen (>= 1.0.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
-      terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
-    guard-rspec (2.5.1)
-      guard (>= 1.1)
-      rspec (~> 2.11)
+    guard-rspec (2.6.0)
+      guard (>= 1.8)
+      rspec (~> 2.13)
     guard-spinach (0.0.2)
       guard (>= 1.1)
       spinach
-    haml (4.0.0)
+    haml (4.0.2)
       tilt
     haml-rails (0.4)
       actionpack (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
       haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
-    hashie (1.2.0)
+    hashie (2.0.4)
     hike (1.2.2)
     http_parser.rb (0.5.3)
-    httparty (0.10.2)
+    httparty (0.11.0)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
     httpauth (0.2.0)
@@ -239,29 +242,32 @@ GEM
       jquery-rails
       railties (>= 3.1.0)
     json (1.7.7)
-    jwt (0.1.5)
-      multi_json (>= 1.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    launchy (2.1.2)
+    launchy (2.2.0)
       addressable (~> 2.3)
-    letter_opener (1.0.0)
-      launchy (>= 2.0.4)
+    letter_opener (1.1.0)
+      launchy (~> 2.2.0)
     libv8 (3.11.8.17)
-    listen (0.7.3)
+    listen (1.0.3)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
     lumberjack (1.0.3)
     mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.1)
-    mime-types (1.22)
+    mime-types (1.23)
     modernizr (2.6.2)
       sprockets (~> 2.0)
     multi_json (1.7.2)
     multi_xml (0.5.3)
-    multipart-post (1.1.5)
+    multipart-post (1.2.0)
     mysql2 (0.3.11)
     net-ldap (0.2.2)
     nokogiri (1.5.9)
@@ -272,13 +278,13 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    omniauth (1.1.3)
-      hashie (~> 1.2)
+    omniauth (1.1.4)
+      hashie (>= 1.2, < 3)
       rack
     omniauth-github (1.1.0)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
-    omniauth-google-oauth2 (0.1.13)
+    omniauth-google-oauth2 (0.1.17)
       omniauth (~> 1.0)
       omniauth-oauth2
     omniauth-oauth (1.0.1)
@@ -287,31 +293,31 @@ GEM
     omniauth-oauth2 (1.1.1)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-    omniauth-twitter (0.0.14)
+    omniauth-twitter (0.0.16)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
     orm_adapter (0.4.0)
-    pg (0.14.1)
+    pg (0.15.1)
     polyglot (0.3.3)
     posix-spawn (0.3.6)
-    pry (0.9.12)
+    pry (0.9.12.1)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    puma (2.0.0.b7)
+    puma (2.0.1)
       rack (>= 1.1, < 2.0)
     pygments.rb (0.4.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     pyu-ruby-sasl (0.0.3.3)
-    quiet_assets (1.0.1)
-      railties (~> 3.1)
+    quiet_assets (1.0.2)
+      railties (>= 3.1, < 5.0)
     rack (1.4.5)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-mini-profiler (0.1.23)
+    rack-mini-profiler (0.1.26)
       rack (>= 1.1.3)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
@@ -348,13 +354,15 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.4)
-    rb-fsevent (0.9.2)
-    rb-inotify (0.8.8)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.2.2)
-    redis (3.0.3)
+    redis (3.0.4)
     redis-actionpack (3.2.3)
       actionpack (~> 3.2.3)
       redis-rack (~> 1.4.0)
@@ -383,8 +391,8 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -395,7 +403,7 @@ GEM
     rubyntlm (0.1.1)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.2.7)
+    sass (3.2.8)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -410,11 +418,11 @@ GEM
       sass-rails (>= 3.2)
       thor (~> 0.14)
     settingslogic (2.0.9)
-    sexp_processor (4.2.0)
+    sexp_processor (4.2.1)
     shoulda-matchers (1.3.0)
       activesupport (>= 3.0.0)
-    sidekiq (2.9.0)
-      celluloid (~> 0.12.0)
+    sidekiq (2.11.1)
+      celluloid (~> 0.13.0)
       connection_pool (~> 1.0)
       multi_json (~> 1)
       redis (~> 3)
@@ -428,15 +436,15 @@ GEM
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
     six (0.2.0)
-    slim (1.3.6)
-      temple (~> 0.5.5)
+    slim (1.3.8)
+      temple (~> 0.6.3)
       tilt (~> 1.3.3)
     slop (3.4.4)
-    spinach (0.8.1)
+    spinach (0.8.2)
       colorize (= 0.5.8)
-      gherkin-ruby (~> 0.2.1)
-    spinach-rails (0.1.7)
-      capybara (>= 1.0)
+      gherkin-ruby (~> 0.3.0)
+    spinach-rails (0.2.1)
+      capybara (>= 2.0.0)
       railties (>= 3)
       spinach (>= 0.4)
     spork (1.0.0rc3)
@@ -446,15 +454,14 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     stamp (0.5.0)
-    state_machine (1.1.2)
+    state_machine (1.2.0)
     stringex (1.5.1)
-    temple (0.5.5)
-    terminal-table (1.4.5)
-    test_after_commit (0.0.1)
+    temple (0.6.4)
+    test_after_commit (0.2.0)
     therubyracer (0.11.4)
       libv8 (~> 3.11.8.12)
       ref
-    thin (1.5.0)
+    thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
@@ -467,7 +474,7 @@ GEM
     turbolinks (1.1.1)
       coffee-rails
     tzinfo (0.3.37)
-    uglifier (1.3.0)
+    uglifier (2.0.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     virtus (0.5.4)
@@ -475,9 +482,9 @@ GEM
       descendants_tracker (~> 0.0.1)
     warden (1.2.1)
       rack (>= 1.0)
-    webmock (1.9.0)
+    webmock (1.11.0)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+      crack (>= 0.3.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.1.0)
@@ -486,7 +493,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  acts-as-taggable-on (= 2.3.3)
+  acts-as-taggable-on
   annotate!
   awesome_print
   better_errors
@@ -495,7 +502,7 @@ DEPENDENCIES
   capybara
   carrierwave
   chosen-rails (= 0.9.8)
-  coffee-rails (~> 3.2.2)
+  coffee-rails
   colored
   coveralls
   database_cleaner
@@ -507,7 +514,7 @@ DEPENDENCIES
   font-awesome-sass-rails (~> 3.0.0)
   foreman
   gemoji (~> 1.2.1)
-  github-linguist (~> 2.3.4)
+  github-linguist
   github-markup (~> 0.7.4)
   gitlab-grack (~> 1.0.0)
   gitlab-pygments.rb (~> 0.3.2)
@@ -516,8 +523,8 @@ DEPENDENCIES
   gitlab_omniauth-ldap (= 1.0.2)
   gollum-lib (~> 1.0.0)
   gon
-  grape (~> 0.3.1)
-  grape-entity (~> 0.2.0)
+  grape
+  grape-entity
   grit (~> 2.5.0)!
   growl
   guard-rspec
@@ -540,7 +547,7 @@ DEPENDENCIES
   pg
   poltergeist!
   pry
-  puma (~> 2.0.0.b7)
+  puma (~> 2.0.1)
   quiet_assets (~> 1.0.1)
   rack-mini-profiler
   rails (= 3.2.13)
@@ -552,7 +559,7 @@ DEPENDENCIES
   redcarpet (~> 2.2.2)
   redis-rails
   rspec-rails
-  sass-rails (~> 3.2.5)
+  sass-rails
   sdoc
   seed-fu
   select2-rails
@@ -571,5 +578,5 @@ DEPENDENCIES
   therubyracer
   thin
   turbolinks
-  uglifier (~> 1.3.0)
+  uglifier
   webmock

diff --git a/spec/observers/merge_request_observer_spec.rb b/spec/observers/merge_request_observer_spec.rb
index 24a0564..82c3fbc 100644 (file)
--- a/spec/observers/merge_request_observer_spec.rb
+++ b/spec/observers/merge_request_observer_spec.rb
@@ -12,6 +12,8 @@ describe MergeRequestObserver do
 
   before { subject.stub(:current_user).and_return(some_user) }
   before { subject.stub(notification: mock('NotificationService').as_null_object) }
+  before(:each) { enable_observers }
+
 
   subject { MergeRequestObserver.instance }
 

diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 362c116..0cf4577 100644 (file)
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -249,7 +249,7 @@ describe Gitlab::API do
       response.status.should == 200
       json_response.should be_an Array
       json_response.count.should == 2
-      json_response.first['email'].should == user.email
+      json_response.last['email'].should == user.email
     end
 
     it "finds team members with query string" do