Gemfile.diff

diff --git a/Gemfile b/Gemfile
index c78f525..1f02f26 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'omniauth-github'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '2.0.1'
+gem "gitlab_git", '2.1.1'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
@@ -41,7 +41,7 @@ gem "gitlab-gollum-lib", "~> 1.0.1", require: 'gollum-lib'
 gem "github-linguist", require: "linguist"
 
 # API
-gem "grape", "~> 0.4.1"
+gem "grape", "~> 0.5.0"
 gem "grape-entity", "~> 0.3.0"
 
 # Format dates and times
@@ -70,14 +70,13 @@ gem "six"
 gem "seed-fu"
 
 # Markdown to HTML
-gem "redcarpet",     "~> 2.2.2"
+gem "redcarpet",     "~> 2.1.1"
 gem "github-markup", "~> 0.7.4", require: 'github/markup'
 
 # Asciidoc to HTML
 gem  "asciidoctor"
 
-# Servers
-gem "puma", '~> 2.3.1', group: :puma
+# Application server
 gem "unicorn", '~> 4.6.3', group: :unicorn
 
 # State machine
@@ -92,7 +91,7 @@ gem 'sinatra', require: nil
 gem 'sidekiq'
 
 # HTTP requests
-gem "httparty"
+gem "httparty", "0.10.2" 
 
 # Colored output to console
 gem "colored"
@@ -107,16 +106,16 @@ gem "foreman"
 gem "redis-rails"
 
 # Campfire integration
-gem 'tinder', '~> 1.9.2'
+#gem 'tinder', '~> 1.9.2'
 
 # HipChat integration
-gem "hipchat", "~> 0.9.0"
+gem "hipchat", "~> 0.11.0"
 
 # d3
-gem "d3_rails", "~> 3.1.4"
+gem "d3_rails", ">= 3.1.4"
 
 # underscore-rails
-gem "underscore-rails", "~> 1.4.4"
+gem "underscore-rails", "~> 1.5.1"
 
 # Sanitize user input
 gem "sanitize"
@@ -125,17 +124,17 @@ group :assets do
   gem "sass-rails"
   gem "coffee-rails"
   gem "uglifier"
-  gem "therubyracer"
+  gem "therubyracer", "0.11.0"
   gem 'turbolinks'
   gem 'jquery-turbolinks'
 
   gem 'chosen-rails',     "1.0.0"
   gem 'select2-rails'
-  gem 'jquery-atwho-rails', "0.3.0"
-  gem "jquery-rails",     "2.1.3"
+  gem 'jquery-atwho-rails', "0.3.1"
+  gem "jquery-rails",     "3.0.4"
   gem "jquery-ui-rails",  "2.0.2"
   gem "modernizr",        "2.6.2"
-  gem "raphael-rails",    git: "https://github.com/gitlabhq/raphael-rails.git"
+  gem "raphael-rails"
   gem 'bootstrap-sass'
   gem "font-awesome-rails"
   gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
@@ -143,7 +142,7 @@ group :assets do
 end
 
 group :development do
-  gem "annotate", git: "https://github.com/ctran/annotate_models.git"
+  gem "annotate"
   gem "letter_opener"
   gem 'quiet_assets', '~> 1.0.1'
   gem 'rack-mini-profiler'
@@ -202,6 +201,3 @@ group :test do
   gem 'test_after_commit'
 end
 
-group :production do
-  gem "gitlab_meta", '6.0'
-end