2018-03-14 22:50:16 +00:00
|
|
|
# --- Special code for migrating to Rails 5.0 ---
|
|
|
|
def rails5?
|
|
|
|
%w[1 true].include?(ENV["RAILS5"])
|
|
|
|
end
|
|
|
|
|
|
|
|
gem_versions = {}
|
|
|
|
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2'
|
|
|
|
gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0'
|
2018-05-10 22:54:27 +00:00
|
|
|
gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10'
|
2018-03-14 22:50:16 +00:00
|
|
|
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'
|
|
|
|
# --- The end of special code for migrating to Rails 5.0 ---
|
|
|
|
|
2016-07-01 23:14:12 +00:00
|
|
|
source 'https://rubygems.org'
|
2011-10-08 21:36:38 +00:00
|
|
|
|
2018-03-14 22:50:16 +00:00
|
|
|
gem 'rails', gem_versions['rails']
|
2015-11-26 13:48:01 +00:00
|
|
|
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
|
2015-11-25 16:18:44 +00:00
|
|
|
|
|
|
|
# Responders respond_to and respond_with
|
|
|
|
gem 'responders', '~> 2.0'
|
2013-12-05 14:26:11 +00:00
|
|
|
|
2016-09-20 20:27:18 +00:00
|
|
|
gem 'sprockets', '~> 3.7.0'
|
2015-07-01 01:38:26 +00:00
|
|
|
|
2014-02-26 08:41:44 +00:00
|
|
|
# Default values for AR models
|
2018-03-14 22:50:16 +00:00
|
|
|
gem 'default_value_for', gem_versions['default_value_for']
|
2014-02-26 08:41:44 +00:00
|
|
|
|
2012-06-20 10:45:26 +00:00
|
|
|
# Supported DBs
|
2017-12-20 00:10:14 +00:00
|
|
|
gem 'mysql2', '~> 0.4.10', group: :mysql
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'pg', '~> 0.18.2', group: :postgres
|
2012-06-20 10:45:26 +00:00
|
|
|
|
2018-03-28 20:41:45 +00:00
|
|
|
gem 'rugged', '~> 0.27'
|
2018-05-30 09:57:46 +00:00
|
|
|
gem 'grape-path-helpers', '~> 1.0'
|
2017-01-04 18:43:06 +00:00
|
|
|
|
2017-06-09 21:26:03 +00:00
|
|
|
gem 'faraday', '~> 0.12'
|
2017-04-12 01:29:30 +00:00
|
|
|
|
2015-06-30 19:25:36 +00:00
|
|
|
# Authentication libraries
|
2018-03-21 17:22:24 +00:00
|
|
|
gem 'devise', '~> 4.4'
|
2018-03-16 11:40:04 +00:00
|
|
|
gem 'doorkeeper', '~> 4.3'
|
2018-06-13 20:32:21 +00:00
|
|
|
gem 'doorkeeper-openid_connect', '~> 1.5'
|
2018-03-15 07:38:01 +00:00
|
|
|
gem 'omniauth', '~> 1.8'
|
2018-03-15 15:01:13 +00:00
|
|
|
gem 'omniauth-auth0', '~> 2.0.0'
|
2017-08-26 17:47:12 +00:00
|
|
|
gem 'omniauth-azure-oauth2', '~> 0.0.9'
|
2017-08-31 00:39:21 +00:00
|
|
|
gem 'omniauth-cas3', '~> 1.1.4'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'omniauth-facebook', '~> 4.0.0'
|
2018-05-01 05:28:05 +00:00
|
|
|
gem 'omniauth-github', '~> 1.3'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'omniauth-gitlab', '~> 1.0.2'
|
2018-03-28 16:31:37 +00:00
|
|
|
gem 'omniauth-google-oauth2', '~> 0.5.3'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
|
2017-02-07 20:43:08 +00:00
|
|
|
gem 'omniauth-oauth2-generic', '~> 0.2.2'
|
2018-03-15 08:20:51 +00:00
|
|
|
gem 'omniauth-saml', '~> 1.10'
|
2018-07-04 02:38:31 +00:00
|
|
|
gem 'omniauth-shibboleth', '~> 1.3.0'
|
2018-03-20 06:52:10 +00:00
|
|
|
gem 'omniauth-twitter', '~> 1.4'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'omniauth_crowd', '~> 2.2.0'
|
2018-05-24 18:08:16 +00:00
|
|
|
gem 'omniauth-authentiq', '~> 0.3.3'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'rack-oauth2', '~> 1.2.1'
|
|
|
|
gem 'jwt', '~> 1.5.6'
|
2012-06-20 10:45:26 +00:00
|
|
|
|
2016-01-09 19:30:34 +00:00
|
|
|
# Spam and anti-bot protection
|
2016-06-06 07:31:26 +00:00
|
|
|
gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
|
2016-01-09 19:30:34 +00:00
|
|
|
gem 'akismet', '~> 2.0'
|
2015-12-27 17:03:06 +00:00
|
|
|
|
2015-03-27 22:35:26 +00:00
|
|
|
# Two-factor authentication
|
2016-05-19 18:52:08 +00:00
|
|
|
gem 'devise-two-factor', '~> 3.0.0'
|
2015-08-26 01:42:46 +00:00
|
|
|
gem 'rqrcode-rails3', '~> 0.1.7'
|
2018-04-16 13:51:20 +00:00
|
|
|
gem 'attr_encrypted', '~> 3.1.0'
|
2016-06-06 04:38:42 +00:00
|
|
|
gem 'u2f', '~> 0.2.1'
|
2015-03-27 22:35:26 +00:00
|
|
|
|
2016-02-09 17:06:55 +00:00
|
|
|
# GitLab Pages
|
2016-12-20 11:24:44 +00:00
|
|
|
gem 'validates_hostname', '~> 1.0.6'
|
2016-02-09 17:06:55 +00:00
|
|
|
|
2014-12-15 10:11:38 +00:00
|
|
|
# Browser detection
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'browser', '~> 2.2'
|
2014-12-15 10:11:38 +00:00
|
|
|
|
2017-02-15 00:01:30 +00:00
|
|
|
# GPG
|
|
|
|
gem 'gpgme'
|
|
|
|
|
2012-12-30 13:15:56 +00:00
|
|
|
# LDAP Auth
|
2015-07-12 20:46:51 +00:00
|
|
|
# GitLab fork with several improvements to original library. For full list of changes
|
2015-06-01 10:59:02 +00:00
|
|
|
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
|
2017-08-10 15:50:14 +00:00
|
|
|
gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
|
2017-06-13 22:25:06 +00:00
|
|
|
gem 'net-ldap'
|
2012-12-30 13:15:56 +00:00
|
|
|
|
2013-05-13 19:54:23 +00:00
|
|
|
# Git Wiki
|
2016-02-28 12:11:43 +00:00
|
|
|
# Required manually in config/initializers/gollum.rb to control load order
|
2018-04-18 17:50:56 +00:00
|
|
|
gem 'gitlab-gollum-lib', '~> 4.2', require: false
|
2018-04-13 13:17:52 +00:00
|
|
|
|
|
|
|
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
|
2013-05-13 19:54:23 +00:00
|
|
|
|
2012-10-02 13:29:03 +00:00
|
|
|
# Language detection
|
2018-02-20 16:59:04 +00:00
|
|
|
gem 'github-linguist', '~> 5.3.3', require: 'linguist'
|
2012-10-02 13:29:03 +00:00
|
|
|
|
2012-08-11 19:59:56 +00:00
|
|
|
# API
|
2017-08-16 16:06:59 +00:00
|
|
|
gem 'grape', '~> 1.0'
|
2018-04-04 14:56:14 +00:00
|
|
|
gem 'grape-entity', '~> 0.7.1'
|
2018-01-02 20:20:42 +00:00
|
|
|
gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
2017-08-16 13:04:41 +00:00
|
|
|
# GraphQL API
|
2018-05-23 07:55:14 +00:00
|
|
|
gem 'graphql', '~> 1.8.0'
|
2017-08-16 13:04:41 +00:00
|
|
|
gem 'graphiql-rails', '~> 1.4.10'
|
|
|
|
|
2017-04-09 19:41:23 +00:00
|
|
|
# Disable strong_params so that Mash does not respond to :permitted?
|
|
|
|
gem 'hashie-forbidden_attributes'
|
|
|
|
|
2012-08-11 19:59:56 +00:00
|
|
|
# Pagination
|
2017-08-10 13:01:38 +00:00
|
|
|
gem 'kaminari', '~> 1.0'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
|
|
|
# HAML
|
2018-07-02 16:19:57 +00:00
|
|
|
gem 'hamlit', '~> 2.8.8'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
|
|
|
# Files attachments
|
2017-10-29 12:19:40 +00:00
|
|
|
gem 'carrierwave', '~> 1.2'
|
2017-09-26 07:51:24 +00:00
|
|
|
gem 'mini_magick'
|
2013-07-08 06:47:31 +00:00
|
|
|
|
2014-05-23 08:22:00 +00:00
|
|
|
# Drag and Drop UI
|
2015-08-26 01:42:46 +00:00
|
|
|
gem 'dropzonejs-rails', '~> 0.7.1'
|
2014-05-23 08:22:00 +00:00
|
|
|
|
2016-06-01 06:58:27 +00:00
|
|
|
# for backups
|
2018-03-23 10:07:22 +00:00
|
|
|
gem 'fog-aws', '~> 2.0.1'
|
2017-05-01 20:15:16 +00:00
|
|
|
gem 'fog-core', '~> 1.44'
|
2018-03-23 10:07:22 +00:00
|
|
|
gem 'fog-google', '~> 1.3.3'
|
2016-06-01 06:58:27 +00:00
|
|
|
gem 'fog-local', '~> 0.3'
|
|
|
|
gem 'fog-openstack', '~> 0.1'
|
2016-06-29 07:26:35 +00:00
|
|
|
gem 'fog-rackspace', '~> 0.1.1'
|
2017-10-22 22:58:59 +00:00
|
|
|
gem 'fog-aliyun', '~> 0.2.0'
|
2016-06-01 06:58:27 +00:00
|
|
|
|
2017-01-06 18:07:50 +00:00
|
|
|
# for Google storage
|
2018-03-16 08:09:18 +00:00
|
|
|
gem 'google-api-client', '~> 0.19.8'
|
2017-01-06 18:07:50 +00:00
|
|
|
|
2013-05-01 09:41:37 +00:00
|
|
|
# for aws storage
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'unf', '~> 0.1.4'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
|
|
|
# Seed data
|
2018-01-16 12:27:04 +00:00
|
|
|
gem 'seed-fu', '~> 2.3.7'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
2015-04-29 19:02:41 +00:00
|
|
|
# Markdown and HTML processing
|
2018-06-30 11:35:03 +00:00
|
|
|
gem 'html-pipeline', '~> 2.8'
|
2017-05-19 03:05:05 +00:00
|
|
|
gem 'deckar01-task_list', '2.0.0'
|
2018-06-08 17:41:54 +00:00
|
|
|
gem 'gitlab-markup', '~> 1.6.4'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'redcarpet', '~> 3.4'
|
2018-03-07 12:14:41 +00:00
|
|
|
gem 'commonmarker', '~> 0.17'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'RedCloth', '~> 4.3.2'
|
2018-05-26 16:30:24 +00:00
|
|
|
gem 'rdoc', '~> 6.0'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'org-ruby', '~> 0.9.12'
|
|
|
|
gem 'creole', '~> 0.5.0'
|
|
|
|
gem 'wikicloth', '0.8.1'
|
2018-03-27 15:08:03 +00:00
|
|
|
gem 'asciidoctor', '~> 1.5.6'
|
2018-03-27 15:09:43 +00:00
|
|
|
gem 'asciidoctor-plantuml', '0.0.8'
|
2018-04-17 17:02:43 +00:00
|
|
|
gem 'rouge', '~> 3.1'
|
2017-08-31 00:39:21 +00:00
|
|
|
gem 'truncato', '~> 0.7.9'
|
2017-04-28 14:53:42 +00:00
|
|
|
gem 'bootstrap_form', '~> 2.7.0'
|
2018-01-30 17:26:32 +00:00
|
|
|
gem 'nokogiri', '~> 1.8.2'
|
2015-12-18 18:19:33 +00:00
|
|
|
|
2018-05-31 14:01:04 +00:00
|
|
|
# Calendar rendering
|
|
|
|
gem 'icalendar'
|
|
|
|
|
2014-04-15 15:02:02 +00:00
|
|
|
# Diffs
|
2016-10-29 00:29:42 +00:00
|
|
|
gem 'diffy', '~> 3.1.0'
|
2014-04-15 15:02:02 +00:00
|
|
|
|
2013-08-19 19:54:12 +00:00
|
|
|
# Application server
|
2013-12-18 16:06:49 +00:00
|
|
|
group :unicorn do
|
2016-09-22 00:31:09 +00:00
|
|
|
gem 'unicorn', '~> 5.1.0'
|
|
|
|
gem 'unicorn-worker-killer', '~> 0.4.4'
|
2013-12-18 16:06:49 +00:00
|
|
|
end
|
2012-08-11 19:59:56 +00:00
|
|
|
|
2013-02-14 15:33:20 +00:00
|
|
|
# State machine
|
2018-03-26 15:09:59 +00:00
|
|
|
gem 'state_machines-activerecord', '~> 0.5.1'
|
2013-02-14 15:33:20 +00:00
|
|
|
|
2012-08-11 19:59:56 +00:00
|
|
|
# Issue tags
|
2018-03-12 14:18:53 +00:00
|
|
|
gem 'acts-as-taggable-on', '~> 5.0'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
|
|
|
# Background jobs
|
2018-05-05 10:14:11 +00:00
|
|
|
gem 'sidekiq', '~> 5.1'
|
2017-05-10 15:48:09 +00:00
|
|
|
gem 'sidekiq-cron', '~> 0.6.0'
|
2018-05-26 14:35:48 +00:00
|
|
|
gem 'redis-namespace', '~> 1.6.0'
|
2017-08-21 11:50:09 +00:00
|
|
|
gem 'sidekiq-limit_fetch', '~> 3.4', require: false
|
2012-08-11 19:59:56 +00:00
|
|
|
|
2017-03-29 13:22:40 +00:00
|
|
|
# Cron Parser
|
2017-05-10 15:48:09 +00:00
|
|
|
gem 'rufus-scheduler', '~> 3.4'
|
2017-03-29 13:22:40 +00:00
|
|
|
|
2012-08-11 19:59:56 +00:00
|
|
|
# HTTP requests
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'httparty', '~> 0.13.3'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
|
|
|
# Colored output to console
|
2017-06-19 22:33:07 +00:00
|
|
|
gem 'rainbow', '~> 2.2'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
2018-05-10 03:53:21 +00:00
|
|
|
# Progress bar
|
|
|
|
gem 'ruby-progressbar'
|
|
|
|
|
2012-11-18 20:51:49 +00:00
|
|
|
# GitLab settings
|
2015-08-26 01:42:46 +00:00
|
|
|
gem 'settingslogic', '~> 2.0.9'
|
2011-11-04 07:42:36 +00:00
|
|
|
|
2017-06-22 15:33:17 +00:00
|
|
|
# Linear-time regex library for untrusted regular expressions
|
2017-07-25 06:29:04 +00:00
|
|
|
gem 're2', '~> 1.1.1'
|
2017-06-22 15:33:17 +00:00
|
|
|
|
2012-08-11 19:59:56 +00:00
|
|
|
# Misc
|
2015-08-26 01:42:46 +00:00
|
|
|
|
2016-08-08 18:36:39 +00:00
|
|
|
gem 'version_sorter', '~> 2.1.0'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
2018-05-02 08:08:16 +00:00
|
|
|
# User agent parsing
|
|
|
|
gem 'device_detector'
|
|
|
|
|
2013-03-06 15:30:48 +00:00
|
|
|
# Cache
|
2017-12-06 17:27:06 +00:00
|
|
|
gem 'redis-rails', '~> 5.0.2'
|
2013-03-06 15:30:48 +00:00
|
|
|
|
2016-04-06 08:49:57 +00:00
|
|
|
# Redis
|
|
|
|
gem 'redis', '~> 3.2'
|
|
|
|
gem 'connection_pool', '~> 2.0'
|
|
|
|
|
2013-05-23 18:10:32 +00:00
|
|
|
# HipChat integration
|
2015-03-30 22:53:24 +00:00
|
|
|
gem 'hipchat', '~> 1.5.0'
|
2013-05-23 18:10:32 +00:00
|
|
|
|
2016-01-14 14:20:23 +00:00
|
|
|
# JIRA integration
|
2017-08-16 22:05:32 +00:00
|
|
|
gem 'jira-ruby', '~> 1.4'
|
2016-01-14 14:20:23 +00:00
|
|
|
|
2013-08-19 09:11:36 +00:00
|
|
|
# Flowdock integration
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
|
2013-08-19 09:11:36 +00:00
|
|
|
|
2014-02-18 23:09:16 +00:00
|
|
|
# Gemnasium integration
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'gemnasium-gitlab-service', '~> 0.2'
|
2014-02-18 23:09:16 +00:00
|
|
|
|
2014-03-18 17:27:03 +00:00
|
|
|
# Slack integration
|
2016-11-30 14:51:48 +00:00
|
|
|
gem 'slack-notifier', '~> 1.5.1'
|
2014-03-18 17:27:03 +00:00
|
|
|
|
2018-06-24 10:35:35 +00:00
|
|
|
# Hangouts Chat integration
|
|
|
|
gem 'hangouts-chat', '~> 0.0.5'
|
|
|
|
|
2014-07-29 15:41:55 +00:00
|
|
|
# Asana integration
|
2017-04-12 01:29:30 +00:00
|
|
|
gem 'asana', '~> 0.6.0'
|
2014-07-29 15:41:55 +00:00
|
|
|
|
2015-08-04 22:21:12 +00:00
|
|
|
# FogBugz integration
|
2015-09-15 20:09:32 +00:00
|
|
|
gem 'ruby-fogbugz', '~> 0.2.1'
|
2015-08-04 22:21:12 +00:00
|
|
|
|
2016-12-08 16:36:26 +00:00
|
|
|
# Kubernetes integration
|
2018-05-29 10:38:36 +00:00
|
|
|
gem 'kubeclient', '~> 3.1.0'
|
2016-12-08 16:36:26 +00:00
|
|
|
|
2013-07-10 10:48:03 +00:00
|
|
|
# Sanitize user input
|
2018-06-14 13:28:56 +00:00
|
|
|
gem 'sanitize', '~> 4.6.5'
|
Fix Error 500 when creating global milestones with Unicode characters
Two issues:
1. The constraints in the resources were incorrect. Here's what it was before:
```
group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```
In this case, id is actually the title of the milestone, which can be anything at the moment.
After:
```
group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```
2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like:
ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]):
This change uses the babosa library to create a better slug, which surprisingly
isn't actually used by the global milestone controllers. Instead, they use the
title passed as a query string for some reason.
Closes https://github.com/gitlabhq/gitlabhq/issues/9881
Fix constraints
2015-12-04 07:33:52 +00:00
|
|
|
gem 'babosa', '~> 1.0.2'
|
2013-07-10 10:48:03 +00:00
|
|
|
|
2015-09-13 03:54:06 +00:00
|
|
|
# Sanitizes SVG input
|
2018-03-22 20:41:35 +00:00
|
|
|
gem 'loofah', '~> 2.2'
|
2015-09-13 03:54:06 +00:00
|
|
|
|
2016-03-01 12:36:50 +00:00
|
|
|
# Working with license
|
2018-03-13 12:51:17 +00:00
|
|
|
gem 'licensee', '~> 8.9'
|
2016-03-01 12:36:50 +00:00
|
|
|
|
2013-09-24 18:13:25 +00:00
|
|
|
# Protect against bruteforcing
|
2016-10-29 00:40:13 +00:00
|
|
|
gem 'rack-attack', '~> 4.4.1'
|
2013-09-24 18:13:25 +00:00
|
|
|
|
2014-02-10 14:18:46 +00:00
|
|
|
# Ace editor
|
2016-07-26 11:52:37 +00:00
|
|
|
gem 'ace-rails-ap', '~> 4.1.0'
|
2014-02-10 14:18:46 +00:00
|
|
|
|
2014-09-24 10:26:53 +00:00
|
|
|
# Keyboard shortcuts
|
2015-08-26 01:42:46 +00:00
|
|
|
gem 'mousetrap-rails', '~> 1.4.6'
|
2014-08-21 08:14:31 +00:00
|
|
|
|
2015-03-15 14:42:31 +00:00
|
|
|
# Detect and convert string character encoding
|
2017-08-16 14:25:00 +00:00
|
|
|
gem 'charlock_holmes', '~> 0.7.5'
|
2015-03-15 14:42:31 +00:00
|
|
|
|
2018-01-15 16:23:48 +00:00
|
|
|
# Faster blank
|
|
|
|
gem 'fast_blank'
|
|
|
|
|
2016-08-10 15:51:01 +00:00
|
|
|
# Parse time & duration
|
|
|
|
gem 'chronic', '~> 0.10.2'
|
2016-05-18 20:21:51 +00:00
|
|
|
gem 'chronic_duration', '~> 0.10.6'
|
|
|
|
|
2017-04-04 17:47:12 +00:00
|
|
|
gem 'webpack-rails', '~> 0.9.10'
|
2017-02-04 15:52:03 +00:00
|
|
|
gem 'rack-proxy', '~> 0.6.0'
|
|
|
|
|
2017-01-19 15:29:15 +00:00
|
|
|
gem 'sass-rails', '~> 5.0.6'
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'uglifier', '~> 2.7.2'
|
2013-12-06 15:04:50 +00:00
|
|
|
|
2017-09-25 16:19:59 +00:00
|
|
|
gem 'addressable', '~> 2.5.2'
|
2017-03-07 00:01:17 +00:00
|
|
|
gem 'font-awesome-rails', '~> 4.7'
|
2017-08-31 00:39:21 +00:00
|
|
|
gem 'gemojione', '~> 3.3'
|
2018-05-05 09:02:40 +00:00
|
|
|
gem 'gon', '~> 6.2'
|
2015-10-26 09:39:33 +00:00
|
|
|
gem 'jquery-atwho-rails', '~> 1.3.2'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'request_store', '~> 1.3'
|
|
|
|
gem 'select2-rails', '~> 3.5.9'
|
|
|
|
gem 'virtus', '~> 1.0.1'
|
|
|
|
gem 'base32', '~> 0.3.0'
|
2011-10-08 21:36:38 +00:00
|
|
|
|
2016-01-22 21:04:22 +00:00
|
|
|
# Sentry integration
|
2018-03-13 05:29:21 +00:00
|
|
|
gem 'sentry-raven', '~> 2.7'
|
2016-01-22 21:04:22 +00:00
|
|
|
|
2017-06-26 14:52:43 +00:00
|
|
|
gem 'premailer-rails', '~> 1.9.7'
|
2016-01-28 16:54:13 +00:00
|
|
|
|
2017-04-13 03:41:46 +00:00
|
|
|
# I18n
|
2017-06-09 18:10:17 +00:00
|
|
|
gem 'ruby_parser', '~> 3.8', require: false
|
2018-03-14 22:50:16 +00:00
|
|
|
gem 'rails-i18n', gem_versions['rails-i18n']
|
2017-04-13 03:41:46 +00:00
|
|
|
gem 'gettext_i18n_rails', '~> 1.8.0'
|
2018-03-16 14:29:11 +00:00
|
|
|
gem 'gettext_i18n_rails_js', '~> 1.3'
|
2017-04-13 03:41:46 +00:00
|
|
|
gem 'gettext', '~> 3.2.2', require: false, group: :development
|
|
|
|
|
2017-12-05 13:15:30 +00:00
|
|
|
gem 'batch-loader', '~> 1.2.1'
|
2017-11-03 13:16:43 +00:00
|
|
|
|
2017-05-17 11:20:55 +00:00
|
|
|
# Perf bar
|
|
|
|
gem 'peek', '~> 1.0.1'
|
|
|
|
gem 'peek-gc', '~> 0.0.2'
|
|
|
|
gem 'peek-mysql2', '~> 1.1.0', group: :mysql
|
2017-06-07 07:57:21 +00:00
|
|
|
gem 'peek-pg', '~> 1.3.0', group: :postgres
|
2017-05-17 11:20:55 +00:00
|
|
|
gem 'peek-rblineprof', '~> 0.2.0'
|
|
|
|
gem 'peek-redis', '~> 1.2.0'
|
|
|
|
gem 'peek-sidekiq', '~> 1.0.3'
|
|
|
|
|
Storing of application metrics in InfluxDB
This adds the ability to write application metrics (e.g. SQL timings) to
InfluxDB. These metrics can in turn be visualized using Grafana, or
really anything else that can read from InfluxDB. These metrics can be
used to track application performance over time, between different Ruby
versions, different GitLab versions, etc.
== Transaction Metrics
Currently the following is tracked on a per transaction basis (a
transaction is a Rails request or a single Sidekiq job):
* Timings per query along with the raw (obfuscated) SQL and information
about what file the query originated from.
* Timings per view along with the path of the view and information about
what file triggered the rendering process.
* The duration of a request itself along with the controller/worker
class and method name.
* The duration of any instrumented method calls (more below).
== Sampled Metrics
Certain metrics can't be directly associated with a transaction. For
example, a process' total memory usage is unrelated to any running
transactions. While a transaction can result in the memory usage going
up there's no accurate way to determine what transaction is to blame,
this becomes especially problematic in multi-threaded environments.
To solve this problem there's a separate thread that takes samples at a
fixed interval. This thread (using the class Gitlab::Metrics::Sampler)
currently tracks the following:
* The process' total memory usage.
* The number of file descriptors opened by the process.
* The amount of Ruby objects (using ObjectSpace.count_objects).
* GC statistics such as timings, heap slots, etc.
The default/current interval is 15 seconds, any smaller interval might
put too much pressure on InfluxDB (especially when running dozens of
processes).
== Method Instrumentation
While currently not yet used methods can be instrumented to track how
long they take to run. Unlike the likes of New Relic this doesn't
require modifying the source code (e.g. including modules), it all
happens from the outside. For example, to track `User.by_login` we'd add
the following code somewhere in an initializer:
Gitlab::Metrics::Instrumentation.
instrument_method(User, :by_login)
to instead instrument an instance method:
Gitlab::Metrics::Instrumentation.
instrument_instance_method(User, :save)
Instrumentation for either all public model methods or a few crucial
ones will be added in the near future, I simply haven't gotten to doing
so just yet.
== Configuration
By default metrics are disabled. This means users don't have to bother
setting anything up if they don't want to. Metrics can be enabled by
editing one's gitlab.yml configuration file (see
config/gitlab.yml.example for example settings).
== Writing Data To InfluxDB
Because InfluxDB is still a fairly young product I expect the worse.
Data loss, unexpected reboots, the database not responding, you name it.
Because of this data is _not_ written to InfluxDB directly, instead it's
queued and processed by Sidekiq. This ensures that users won't notice
anything when InfluxDB is giving trouble.
The metrics worker can be started in a standalone manner as following:
bundle exec sidekiq -q metrics
The corresponding class is called MetricsWorker.
2015-12-09 15:45:51 +00:00
|
|
|
# Metrics
|
|
|
|
group :metrics do
|
2015-12-15 16:23:23 +00:00
|
|
|
gem 'method_source', '~> 0.8', require: false
|
Storing of application metrics in InfluxDB
This adds the ability to write application metrics (e.g. SQL timings) to
InfluxDB. These metrics can in turn be visualized using Grafana, or
really anything else that can read from InfluxDB. These metrics can be
used to track application performance over time, between different Ruby
versions, different GitLab versions, etc.
== Transaction Metrics
Currently the following is tracked on a per transaction basis (a
transaction is a Rails request or a single Sidekiq job):
* Timings per query along with the raw (obfuscated) SQL and information
about what file the query originated from.
* Timings per view along with the path of the view and information about
what file triggered the rendering process.
* The duration of a request itself along with the controller/worker
class and method name.
* The duration of any instrumented method calls (more below).
== Sampled Metrics
Certain metrics can't be directly associated with a transaction. For
example, a process' total memory usage is unrelated to any running
transactions. While a transaction can result in the memory usage going
up there's no accurate way to determine what transaction is to blame,
this becomes especially problematic in multi-threaded environments.
To solve this problem there's a separate thread that takes samples at a
fixed interval. This thread (using the class Gitlab::Metrics::Sampler)
currently tracks the following:
* The process' total memory usage.
* The number of file descriptors opened by the process.
* The amount of Ruby objects (using ObjectSpace.count_objects).
* GC statistics such as timings, heap slots, etc.
The default/current interval is 15 seconds, any smaller interval might
put too much pressure on InfluxDB (especially when running dozens of
processes).
== Method Instrumentation
While currently not yet used methods can be instrumented to track how
long they take to run. Unlike the likes of New Relic this doesn't
require modifying the source code (e.g. including modules), it all
happens from the outside. For example, to track `User.by_login` we'd add
the following code somewhere in an initializer:
Gitlab::Metrics::Instrumentation.
instrument_method(User, :by_login)
to instead instrument an instance method:
Gitlab::Metrics::Instrumentation.
instrument_instance_method(User, :save)
Instrumentation for either all public model methods or a few crucial
ones will be added in the near future, I simply haven't gotten to doing
so just yet.
== Configuration
By default metrics are disabled. This means users don't have to bother
setting anything up if they don't want to. Metrics can be enabled by
editing one's gitlab.yml configuration file (see
config/gitlab.yml.example for example settings).
== Writing Data To InfluxDB
Because InfluxDB is still a fairly young product I expect the worse.
Data loss, unexpected reboots, the database not responding, you name it.
Because of this data is _not_ written to InfluxDB directly, instead it's
queued and processed by Sidekiq. This ensures that users won't notice
anything when InfluxDB is giving trouble.
The metrics worker can be started in a standalone manner as following:
bundle exec sidekiq -q metrics
The corresponding class is called MetricsWorker.
2015-12-09 15:45:51 +00:00
|
|
|
gem 'influxdb', '~> 0.2', require: false
|
2017-05-19 13:10:15 +00:00
|
|
|
|
2017-05-22 17:49:34 +00:00
|
|
|
# Prometheus
|
2018-05-22 13:54:55 +00:00
|
|
|
gem 'prometheus-client-mmap', '~> 0.9.3'
|
2017-07-04 15:28:34 +00:00
|
|
|
gem 'raindrops', '~> 0.18'
|
Storing of application metrics in InfluxDB
This adds the ability to write application metrics (e.g. SQL timings) to
InfluxDB. These metrics can in turn be visualized using Grafana, or
really anything else that can read from InfluxDB. These metrics can be
used to track application performance over time, between different Ruby
versions, different GitLab versions, etc.
== Transaction Metrics
Currently the following is tracked on a per transaction basis (a
transaction is a Rails request or a single Sidekiq job):
* Timings per query along with the raw (obfuscated) SQL and information
about what file the query originated from.
* Timings per view along with the path of the view and information about
what file triggered the rendering process.
* The duration of a request itself along with the controller/worker
class and method name.
* The duration of any instrumented method calls (more below).
== Sampled Metrics
Certain metrics can't be directly associated with a transaction. For
example, a process' total memory usage is unrelated to any running
transactions. While a transaction can result in the memory usage going
up there's no accurate way to determine what transaction is to blame,
this becomes especially problematic in multi-threaded environments.
To solve this problem there's a separate thread that takes samples at a
fixed interval. This thread (using the class Gitlab::Metrics::Sampler)
currently tracks the following:
* The process' total memory usage.
* The number of file descriptors opened by the process.
* The amount of Ruby objects (using ObjectSpace.count_objects).
* GC statistics such as timings, heap slots, etc.
The default/current interval is 15 seconds, any smaller interval might
put too much pressure on InfluxDB (especially when running dozens of
processes).
== Method Instrumentation
While currently not yet used methods can be instrumented to track how
long they take to run. Unlike the likes of New Relic this doesn't
require modifying the source code (e.g. including modules), it all
happens from the outside. For example, to track `User.by_login` we'd add
the following code somewhere in an initializer:
Gitlab::Metrics::Instrumentation.
instrument_method(User, :by_login)
to instead instrument an instance method:
Gitlab::Metrics::Instrumentation.
instrument_instance_method(User, :save)
Instrumentation for either all public model methods or a few crucial
ones will be added in the near future, I simply haven't gotten to doing
so just yet.
== Configuration
By default metrics are disabled. This means users don't have to bother
setting anything up if they don't want to. Metrics can be enabled by
editing one's gitlab.yml configuration file (see
config/gitlab.yml.example for example settings).
== Writing Data To InfluxDB
Because InfluxDB is still a fairly young product I expect the worse.
Data loss, unexpected reboots, the database not responding, you name it.
Because of this data is _not_ written to InfluxDB directly, instead it's
queued and processed by Sidekiq. This ensures that users won't notice
anything when InfluxDB is giving trouble.
The metrics worker can be started in a standalone manner as following:
bundle exec sidekiq -q metrics
The corresponding class is called MetricsWorker.
2015-12-09 15:45:51 +00:00
|
|
|
end
|
|
|
|
|
2011-10-27 19:37:17 +00:00
|
|
|
group :development do
|
2018-03-12 14:54:40 +00:00
|
|
|
gem 'foreman', '~> 0.84.0'
|
2018-04-01 14:44:18 +00:00
|
|
|
gem 'brakeman', '~> 4.2', require: false
|
2015-08-26 01:42:46 +00:00
|
|
|
|
2016-04-22 20:13:59 +00:00
|
|
|
gem 'letter_opener_web', '~> 1.3.0'
|
2016-07-01 23:54:17 +00:00
|
|
|
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
|
2013-10-01 12:15:14 +00:00
|
|
|
|
2012-12-25 22:42:53 +00:00
|
|
|
# Better errors handler
|
2017-03-25 16:19:22 +00:00
|
|
|
gem 'better_errors', '~> 2.1.0'
|
2015-08-26 01:42:46 +00:00
|
|
|
gem 'binding_of_caller', '~> 0.7.2'
|
2012-12-30 12:43:00 +00:00
|
|
|
|
2013-01-19 11:56:55 +00:00
|
|
|
# thin instead webrick
|
2016-07-01 15:34:02 +00:00
|
|
|
gem 'thin', '~> 1.7.0'
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
group :development, :test do
|
2018-07-20 11:58:17 +00:00
|
|
|
gem 'bootsnap', '~> 1.3'
|
2017-03-27 17:28:34 +00:00
|
|
|
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
|
2016-12-05 11:21:25 +00:00
|
|
|
gem 'pry-byebug', '~> 3.4.1', platform: :mri
|
2016-07-01 23:54:17 +00:00
|
|
|
gem 'pry-rails', '~> 0.3.4'
|
2015-06-17 22:05:48 +00:00
|
|
|
|
2018-05-30 07:16:58 +00:00
|
|
|
gem 'awesome_print', require: false
|
2017-08-03 20:38:29 +00:00
|
|
|
gem 'fuubar', '~> 2.2.0'
|
2015-08-26 01:42:46 +00:00
|
|
|
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'database_cleaner', '~> 1.5.0'
|
2017-12-14 00:13:44 +00:00
|
|
|
gem 'factory_bot_rails', '~> 4.8.2'
|
2018-06-05 20:16:04 +00:00
|
|
|
gem 'rspec-rails', '~> 3.7.0'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'rspec-retry', '~> 0.4.5'
|
|
|
|
gem 'rspec_profiling', '~> 0.0.5'
|
2017-04-26 14:46:26 +00:00
|
|
|
gem 'rspec-set', '~> 0.1.3'
|
2018-01-23 15:02:32 +00:00
|
|
|
gem 'rspec-parameterized', require: false
|
2012-09-10 06:26:35 +00:00
|
|
|
|
2013-05-06 16:53:19 +00:00
|
|
|
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
|
2015-08-26 01:42:46 +00:00
|
|
|
gem 'minitest', '~> 5.7.0'
|
2013-05-09 08:02:48 +00:00
|
|
|
|
2013-04-04 07:55:43 +00:00
|
|
|
# Generate Fake data
|
2017-01-16 20:22:11 +00:00
|
|
|
gem 'ffaker', '~> 2.4'
|
2013-04-04 07:55:43 +00:00
|
|
|
|
2017-08-13 04:32:03 +00:00
|
|
|
gem 'capybara', '~> 2.15'
|
2015-06-17 22:05:48 +00:00
|
|
|
gem 'capybara-screenshot', '~> 1.0.0'
|
2018-06-03 15:15:58 +00:00
|
|
|
gem 'selenium-webdriver', '~> 3.12'
|
2013-03-26 09:13:30 +00:00
|
|
|
|
2017-03-25 16:58:11 +00:00
|
|
|
gem 'spring', '~> 2.0.0'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'spring-commands-rspec', '~> 1.0.4'
|
2015-08-26 01:42:46 +00:00
|
|
|
|
2018-07-02 13:57:38 +00:00
|
|
|
gem 'gitlab-styles', '~> 2.4', require: false
|
2017-09-19 15:25:42 +00:00
|
|
|
# Pin these dependencies, otherwise a new rule could break the CI pipelines
|
2018-03-28 10:29:08 +00:00
|
|
|
gem 'rubocop', '~> 0.54.0'
|
2018-01-18 17:45:05 +00:00
|
|
|
gem 'rubocop-rspec', '~> 1.22.1'
|
2017-09-19 15:25:42 +00:00
|
|
|
|
2018-01-07 23:47:31 +00:00
|
|
|
gem 'scss_lint', '~> 0.56.0', require: false
|
2017-08-07 09:08:15 +00:00
|
|
|
gem 'haml_lint', '~> 0.26.0', require: false
|
2017-03-25 16:57:22 +00:00
|
|
|
gem 'simplecov', '~> 0.14.0', require: false
|
2018-01-31 13:18:11 +00:00
|
|
|
gem 'flay', '~> 2.10.0', require: false
|
2016-07-01 23:54:17 +00:00
|
|
|
gem 'bundler-audit', '~> 0.5.0', require: false
|
2015-10-02 09:29:46 +00:00
|
|
|
|
2016-07-01 23:54:17 +00:00
|
|
|
gem 'benchmark-ips', '~> 2.3.0', require: false
|
2016-04-17 21:35:18 +00:00
|
|
|
|
2017-11-16 14:14:29 +00:00
|
|
|
gem 'license_finder', '~> 3.1', require: false
|
2018-03-13 22:55:08 +00:00
|
|
|
gem 'knapsack', '~> 1.16'
|
2016-10-17 10:52:16 +00:00
|
|
|
|
2018-03-14 22:50:16 +00:00
|
|
|
gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']
|
2016-11-04 11:43:02 +00:00
|
|
|
|
2017-08-09 08:10:33 +00:00
|
|
|
gem 'stackprof', '~> 0.2.10', require: false
|
2017-07-20 15:32:17 +00:00
|
|
|
|
|
|
|
gem 'simple_po_parser', '~> 1.1.2', require: false
|
2018-03-28 20:09:07 +00:00
|
|
|
|
|
|
|
gem 'timecop', '~> 0.8.0'
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
group :test do
|
2017-07-24 11:19:09 +00:00
|
|
|
gem 'shoulda-matchers', '~> 3.1.2', require: false
|
2018-05-26 14:21:20 +00:00
|
|
|
gem 'email_spec', '~> 2.2.0'
|
2017-09-25 16:19:59 +00:00
|
|
|
gem 'json-schema', '~> 2.8.0'
|
2017-06-15 02:58:02 +00:00
|
|
|
gem 'webmock', '~> 2.3.2'
|
2018-04-08 04:55:08 +00:00
|
|
|
gem 'rails-controller-testing' if rails5? # Rails5 only gem.
|
2018-04-02 22:54:44 +00:00
|
|
|
gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
|
2016-07-01 23:54:17 +00:00
|
|
|
gem 'sham_rack', '~> 1.3.6'
|
2017-03-10 02:28:20 +00:00
|
|
|
gem 'concurrent-ruby', '~> 1.0.5'
|
2017-09-15 14:07:54 +00:00
|
|
|
gem 'test-prof', '~> 0.2.5'
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
2012-08-23 23:21:20 +00:00
|
|
|
|
2018-06-04 02:23:18 +00:00
|
|
|
gem 'octokit', '~> 4.9'
|
2015-08-18 22:46:36 +00:00
|
|
|
|
2017-02-20 16:37:50 +00:00
|
|
|
gem 'mail_room', '~> 0.9.1'
|
2015-08-19 00:02:26 +00:00
|
|
|
|
2016-11-11 05:09:49 +00:00
|
|
|
gem 'email_reply_trimmer', '~> 0.1'
|
2016-11-10 06:24:02 +00:00
|
|
|
gem 'html2text'
|
2015-08-26 01:42:46 +00:00
|
|
|
|
2018-03-13 06:18:40 +00:00
|
|
|
gem 'ruby-prof', '~> 0.17.0'
|
2016-07-15 15:46:39 +00:00
|
|
|
|
2015-08-26 01:42:46 +00:00
|
|
|
# OAuth
|
2017-06-09 21:26:03 +00:00
|
|
|
gem 'oauth2', '~> 1.4'
|
2015-08-26 01:42:46 +00:00
|
|
|
|
2016-04-22 16:50:08 +00:00
|
|
|
# Health check
|
2017-03-03 18:44:08 +00:00
|
|
|
gem 'health_check', '~> 2.6.0'
|
2016-06-22 14:43:28 +00:00
|
|
|
|
|
|
|
# System information
|
2016-12-27 06:05:29 +00:00
|
|
|
gem 'vmstat', '~> 2.3.0'
|
2016-06-29 02:30:01 +00:00
|
|
|
gem 'sys-filesystem', '~> 1.1.6'
|
2017-02-05 18:04:23 +00:00
|
|
|
|
2017-08-03 12:19:11 +00:00
|
|
|
# SSH host key support
|
2018-06-05 05:26:13 +00:00
|
|
|
gem 'net-ssh', '~> 5.0'
|
2018-02-16 16:32:08 +00:00
|
|
|
gem 'sshkey', '~> 1.9.0'
|
2017-08-03 12:19:11 +00:00
|
|
|
|
|
|
|
# Required for ED25519 SSH host key support
|
|
|
|
group :ed25519 do
|
2018-06-05 05:26:13 +00:00
|
|
|
gem 'ed25519', '~> 1.2'
|
2017-08-03 12:19:11 +00:00
|
|
|
gem 'bcrypt_pbkdf', '~> 1.0'
|
|
|
|
end
|
|
|
|
|
2017-02-05 18:04:23 +00:00
|
|
|
# Gitaly GRPC client
|
2018-07-18 02:08:23 +00:00
|
|
|
gem 'gitaly-proto', '~> 0.106.0', require: 'gitaly'
|
2018-04-30 09:35:44 +00:00
|
|
|
gem 'grpc', '~> 1.11.0'
|
2018-03-02 13:03:11 +00:00
|
|
|
|
2018-02-06 16:58:04 +00:00
|
|
|
# Locked until https://github.com/google/protobuf/issues/4210 is closed
|
|
|
|
gem 'google-protobuf', '= 3.5.1'
|
2017-04-04 14:06:07 +00:00
|
|
|
|
2018-02-21 11:39:15 +00:00
|
|
|
gem 'toml-rb', '~> 1.0.0', require: false
|
2017-05-31 21:06:01 +00:00
|
|
|
|
|
|
|
# Feature toggles
|
2018-03-13 13:51:30 +00:00
|
|
|
gem 'flipper', '~> 0.13.0'
|
|
|
|
gem 'flipper-active_record', '~> 0.13.0'
|
|
|
|
gem 'flipper-active_support_cache_store', '~> 0.13.0'
|
Add structured logging for Rails processes
This introduces JSON logging for Rails views saved to a file called
`development_json.log`, `production_json.log`, etc.
For example, instead of this unparsable log:
```
Started GET "/" for 127.0.0.1 at 2012-03-10 14:28:14 +0100
Processing by HomeController#index as HTML
Rendered text template within layouts/application (0.0ms)
Rendered layouts/_assets.html.erb (2.0ms)
Rendered layouts/_top.html.erb (2.6ms)
Rendered layouts/_about.html.erb (0.3ms)
Rendered layouts/_google_analytics.html.erb (0.4ms)
Completed 200 OK in 79ms (Views: 78.8ms | ActiveRecord: 0.0ms)
```
We get a single line with this:
```
{"method":"GET","path":"/,"format":"html","controller":"HomeController","action":"index","status":200,"duration":79,"view":78.8,"db":0.0,"location":"http://localhost/","time":"2017-07-18 09:35:17 -0700"}
```
Part of #20060
2017-07-17 22:54:13 +00:00
|
|
|
|
|
|
|
# Structured logging
|
|
|
|
gem 'lograge', '~> 0.5'
|
2017-09-10 20:10:30 +00:00
|
|
|
gem 'grape_logging', '~> 1.7'
|
2017-12-08 17:04:48 +00:00
|
|
|
|
|
|
|
# Asset synchronization
|
2018-05-05 05:10:59 +00:00
|
|
|
gem 'asset_sync', '~> 2.4'
|