Merge pull request #1981 from riyad/update-gems

Update Gems

Gemfile

@@ -17,7 +17,7 @@ gem "pg", group: :postgres
 
 # Auth
 gem "devise", "~> 2.1.0"
-gem 'omniauth'
+gem 'omniauth', "~> 1.1.1"
 gem 'omniauth-google-oauth2'
 gem 'omniauth-twitter'
 gem 'omniauth-github'
@@ -46,13 +46,13 @@ gem "grape", "~> 0.2.1"
 gem "stamp"
 
 # Pagination
-gem "kaminari"
+gem "kaminari", "~> 0.14.1"
 
 # HAML
-gem "haml-rails"
+gem "haml-rails", "~> 0.3.5"
 
 # Files attachments
-gem "carrierwave"
+gem "carrierwave", "~> 0.7.1"
 
 # Authorization
 gem "six"
@@ -64,21 +64,21 @@ gem "ffaker"
 gem "seed-fu"
 
 # Markdown to HTML
-gem "redcarpet",     "~> 2.1.1"
+gem "redcarpet",     "~> 2.2.2"
 gem "github-markup", "~> 0.7.4", require: 'github/markup'
 
 # Servers
 gem "thin", '~> 1.5.0'
-gem "unicorn"
+gem "unicorn", "~> 4.4.0"
 
 # Issue tags
-gem "acts-as-taggable-on", "2.3.1"
+gem "acts-as-taggable-on", "2.3.3"
 
 # Decorators
-gem "draper"
+gem "draper", "~> 0.18.0"
 
 # Background jobs
-gem "resque", "~> 1.20.0"
+gem "resque", "~> 1.23.0"
 gem 'resque_mailer'
 
 # HTTP requests
@@ -87,34 +87,34 @@ gem "httparty"
 # Colored output to console
 gem "colored"
 
-# GITLAB settings
+# GitLab settings
 gem 'settingslogic'
 
 # Misc
 gem "foreman"
-gem 'gemoji', require: 'emoji/railtie'
 gem "git"
 
 group :assets do
-  gem "sass-rails",   "3.2.5"
-  gem "coffee-rails", "3.2.2"
-  gem "uglifier",     "1.0.3"
+  gem "sass-rails",   "~> 3.2.5"
+  gem "coffee-rails", "~> 3.2.2"
+  gem "uglifier",     "~> 1.3.0"
   gem "therubyracer"
 
-  gem 'chosen-rails'
-  gem 'jquery-atwho-rails', '0.1.6'
-  gem "jquery-rails",     "2.0.2"
-  gem "jquery-ui-rails",  "0.5.0"
-  gem "modernizr",        "2.5.3"
-  gem "raphael-rails",    "1.5.2"
+  gem 'chosen-rails',     "0.9.8"
+  gem 'jquery-atwho-rails', "0.1.6"
+  gem "jquery-rails",     "2.1.3"
+  gem "jquery-ui-rails",  "2.0.2"
+  gem "modernizr",        "2.6.2"
+  gem "raphael-rails",    "2.1.0"
   gem 'bootstrap-sass',   "2.0.4"
   gem "font-awesome-sass-rails", "~> 2.0.0"
+  gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
 end
 
 group :development do
   gem "annotate", git: "https://github.com/ctran/annotate_models.git"
   gem "letter_opener"
-  gem 'quiet_assets', '1.0.1'
+  gem 'quiet_assets', '~> 1.0.1'
   gem 'rack-mini-profiler'
 end
 
@@ -144,7 +144,7 @@ end
 
 group :test do
   gem "simplecov", require: false
-  gem "shoulda-matchers"
+  gem "shoulda-matchers", "1.3.0"
   gem 'email_spec'
   gem 'resque_spec'
   gem "webmock"

config/application.rb

@@ -4,7 +4,7 @@ require 'rails/all'
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  # Bundler.require *Rails.groups(:assets => %w(development test))
+  # Bundler.require(*Rails.groups(:assets => %w(development test)))
   # If you want your assets lazily compiled in production, use this line
   Bundler.require(:default, :assets, Rails.env)
 end
@@ -47,6 +47,14 @@ module Gitlab
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    # Enable escaping HTML in JSON.
+    config.active_support.escape_html_entities_in_json = true
+
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
     # Enforce whitelist mode for mass assignment.
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible

config/environments/development.rb

@@ -22,19 +22,21 @@ Gitlab::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
   # Do not compress assets
   config.assets.compress = false
 
   # Expands the lines which load the assets
   config.assets.debug = true
 
-  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+  # For having correct urls in mails
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+  # Open sent mails in browser
   config.action_mailer.delivery_method = :letter_opener
-
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

config/environments/production.rb

@@ -20,7 +20,7 @@ Gitlab::Application.configure do
   # Generate digests for assets URLs
   config.assets.digest = true
 
-  # Defaults to Rails.root.join("public/assets")
+  # Defaults to nil and saved in location specified by config.assets.prefix
   # config.assets.manifest = YOUR_PATH
 
   # Specifies the header that your server uses for sending files
@@ -33,8 +33,11 @@ Gitlab::Application.configure do
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
   config.cache_store = :memory_store
@@ -58,6 +61,10 @@ Gitlab::Application.configure do
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+
   config.action_mailer.delivery_method = :sendmail
   # Defaults to:
   # # config.action_mailer.sendmail_settings = {

config/environments/test.rb

@@ -29,17 +29,9 @@ Gitlab::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
   # Raise exception on mass assignment protection for Active Record models
   # config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-
-  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-  config.assets.allow_debugging = true
 end

config/initializers/gemoji.rb

+# Workaround for https://github.com/github/gemoji/pull/18
+Gitlab::Application.config.assets.paths << Emoji.images_path