RUBY_PLATFORM.include?('linux') && require_as
end
-gem "rails", "3.2.15"
+gem "rails", "~> 4.0.0"
+
+gem "protected_attributes"
+gem 'rails-observers'
+gem 'actionpack-page_caching'
+gem 'actionpack-action_caching'
# Supported DBs
gem "mysql2", group: :mysql
gem "pg", group: :postgres
# Auth
-gem "devise", '~> 2.2'
-gem "devise-async"
+gem "devise", '3.0.4'
+gem "devise-async", '0.8.0'
gem 'omniauth', "~> 1.1.3"
gem 'omniauth-google-oauth2'
gem 'omniauth-twitter'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
-gem "gitlab_git", "~> 3.0.0.rc2"
+gem "gitlab_git", "~> 4.0.0"
# Ruby/Rack Git Smart-HTTP Server Handler
-gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
+gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
# LDAP Auth
gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
# Syntax highlighter
-gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'
+gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb'
# Git Wiki
-gem "gitlab-gollum-lib", "~> 1.0.1", require: 'gollum-lib'
+gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib'
# Language detection
-gem "github-linguist", require: "linguist"
+gem "gitlab-linguist", "~> 2.9.6", require: "linguist"
# API
-gem "grape", "~> 0.4.1"
+gem "grape", "~> 0.6.1"
gem "grape-entity", "~> 0.3.0"
+gem 'rack-cors', require: 'rack/cors'
+
+# Email validation
+gem "email_validator", "~> 1.4.0", :require => 'email_validator/strict'
# Format dates and times
# based on human-friendly examples
gem 'enumerize'
# Pagination
-gem "kaminari", "~> 0.14.1"
+gem "kaminari", "~> 0.15.1"
# HAML
gem "haml-rails"
# Markdown to HTML
gem "redcarpet", "~> 2.2.2"
-gem "github-markup", "~> 0.7.4", require: 'github/markup'
+gem "github-markup", "~> 0.7.4", require: 'github/markup', git: 'https://github.com/gitlabhq/markup.git', ref: '61ade389c1e1c159359338f570d18464a44ddbc4'
# Asciidoc to HTML
gem "asciidoctor"
# Application server
-gem "unicorn", '~> 4.6.3', group: :unicorn
+group :unicorn do
+ gem "unicorn", '~> 4.6.3'
+ gem 'unicorn-worker-killer'
+end
# State machine
gem "state_machine"
gem 'tinder', '~> 1.9.2'
# HipChat integration
-gem "hipchat", "~> 0.9.0"
+gem "hipchat", "~> 0.14.0"
# Flowdock integration
gem "gitlab-flowdock-git-hook", "~> 0.4.2"
# Protect against bruteforcing
gem "rack-attack"
-group :assets do
- gem "sass-rails"
- gem "coffee-rails"
- gem "uglifier"
- gem "therubyracer"
- 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-ui-rails", "2.0.2"
- gem "modernizr", "2.6.2"
- gem "raphael-rails", "~> 2.1.2"
- gem 'bootstrap-sass'
- gem "font-awesome-rails"
- gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
- gem "gon"
-end
+gem "sass-rails"
+gem "coffee-rails"
+gem "uglifier"
+gem "therubyracer"
+gem 'turbolinks'
+gem 'jquery-turbolinks'
+
+gem 'select2-rails'
+gem 'jquery-atwho-rails', "~> 0.3.3"
+gem "jquery-rails", "2.1.3"
+gem "jquery-ui-rails", "2.0.2"
+gem "modernizr", "2.6.2"
+gem "raphael-rails", "~> 2.1.2"
+gem 'bootstrap-sass', '~> 3.0'
+gem "font-awesome-rails", '~> 3.2'
+gem "gemoji", "~> 1.3.0"
+gem "gon", '~> 5.0.0'
group :development do
gem "annotate", "~> 2.6.0.beta2"
group :development, :test do
gem 'coveralls', require: false
- gem 'rails-dev-tweaks'
+ # gem 'rails-dev-tweaks'
gem 'spinach-rails'
gem "rspec-rails"
gem "capybara"
gem 'poltergeist', '~> 1.4.1'
gem 'spork', '~> 1.0rc'
- gem 'jasmine'
+ gem 'jasmine', '2.0.0.rc5'
end
group :test do