2016-07-01 23:14:12 +00:00
|
|
|
source 'https://rubygems.org'
|
2011-10-08 21:36:38 +00:00
|
|
|
|
2017-02-21 17:01:53 +00:00
|
|
|
gem 'rails', '4.2.8'
|
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
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'default_value_for', '~> 3.0.0'
|
2014-02-26 08:41:44 +00:00
|
|
|
|
2012-06-20 10:45:26 +00:00
|
|
|
# Supported DBs
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'mysql2', '~> 0.3.16', group: :mysql
|
|
|
|
gem 'pg', '~> 0.18.2', group: :postgres
|
2012-06-20 10:45:26 +00:00
|
|
|
|
2017-01-12 12:08:02 +00:00
|
|
|
gem 'rugged', '~> 0.25.1.1'
|
2017-01-04 18:43:06 +00:00
|
|
|
|
2017-04-12 01:29:30 +00:00
|
|
|
gem 'faraday', '~> 0.11.0'
|
|
|
|
|
2015-06-30 19:25:36 +00:00
|
|
|
# Authentication libraries
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'devise', '~> 4.2'
|
|
|
|
gem 'doorkeeper', '~> 4.2.0'
|
2016-12-09 17:36:50 +00:00
|
|
|
gem 'doorkeeper-openid_connect', '~> 1.1.0'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'omniauth', '~> 1.4.2'
|
|
|
|
gem 'omniauth-auth0', '~> 1.4.1'
|
|
|
|
gem 'omniauth-azure-oauth2', '~> 0.0.6'
|
|
|
|
gem 'omniauth-cas3', '~> 1.1.2'
|
|
|
|
gem 'omniauth-facebook', '~> 4.0.0'
|
|
|
|
gem 'omniauth-github', '~> 1.1.1'
|
|
|
|
gem 'omniauth-gitlab', '~> 1.0.2'
|
2016-06-23 14:15:10 +00:00
|
|
|
gem 'omniauth-google-oauth2', '~> 0.4.1'
|
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'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'omniauth-saml', '~> 1.7.0'
|
|
|
|
gem 'omniauth-shibboleth', '~> 1.2.0'
|
|
|
|
gem 'omniauth-twitter', '~> 1.2.0'
|
|
|
|
gem 'omniauth_crowd', '~> 2.2.0'
|
|
|
|
gem 'omniauth-authentiq', '~> 0.3.0'
|
|
|
|
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'
|
2016-05-19 18:55:25 +00:00
|
|
|
gem 'attr_encrypted', '~> 3.0.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
|
|
|
|
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
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-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
|
2016-06-15 17:27:39 +00:00
|
|
|
gem 'gollum-lib', '~> 4.2', require: false
|
2017-01-12 12:08:02 +00:00
|
|
|
gem '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
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
|
2012-10-02 13:29:03 +00:00
|
|
|
|
2012-08-11 19:59:56 +00:00
|
|
|
# API
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'grape', '~> 0.19.0'
|
2016-11-21 08:09:19 +00:00
|
|
|
gem 'grape-entity', '~> 0.6.0'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
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
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'kaminari', '~> 0.17.0'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
|
|
|
# HAML
|
2016-08-18 18:20:50 +00:00
|
|
|
gem 'hamlit', '~> 2.6.1'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
|
|
|
# Files attachments
|
2017-05-01 20:15:16 +00:00
|
|
|
gem 'carrierwave', '~> 1.0'
|
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
|
|
|
|
gem 'fog-aws', '~> 0.9'
|
2017-05-01 20:15:16 +00:00
|
|
|
gem 'fog-core', '~> 1.44'
|
2017-01-06 18:07:50 +00:00
|
|
|
gem 'fog-google', '~> 0.5'
|
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-03-06 11:55:32 +00:00
|
|
|
gem 'fog-aliyun', '~> 0.1.0'
|
2016-06-01 06:58:27 +00:00
|
|
|
|
2017-01-06 18:07:50 +00:00
|
|
|
# for Google storage
|
|
|
|
gem 'google-api-client', '~> 0.8.6'
|
|
|
|
|
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
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'seed-fu', '~> 2.3.5'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
2015-04-29 19:02:41 +00:00
|
|
|
# Markdown and HTML processing
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'html-pipeline', '~> 1.11.0'
|
2017-05-19 03:05:05 +00:00
|
|
|
gem 'deckar01-task_list', '2.0.0'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'gitlab-markup', '~> 1.5.1'
|
|
|
|
gem 'redcarpet', '~> 3.4'
|
|
|
|
gem 'RedCloth', '~> 4.3.2'
|
|
|
|
gem 'rdoc', '~> 4.2'
|
|
|
|
gem 'org-ruby', '~> 0.9.12'
|
|
|
|
gem 'creole', '~> 0.5.0'
|
|
|
|
gem 'wikicloth', '0.8.1'
|
|
|
|
gem 'asciidoctor', '~> 1.5.2'
|
2017-01-16 00:07:02 +00:00
|
|
|
gem 'asciidoctor-plantuml', '0.0.7'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'rouge', '~> 2.0'
|
|
|
|
gem 'truncato', '~> 0.7.8'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
2015-12-18 18:19:33 +00:00
|
|
|
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
|
2016-01-25 21:34:13 +00:00
|
|
|
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
|
2016-02-11 19:31:31 +00:00
|
|
|
gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
|
2015-12-18 18:19:33 +00:00
|
|
|
|
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
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'state_machines-activerecord', '~> 0.4.0'
|
2015-09-25 08:46:13 +00:00
|
|
|
# Run events after state machine commits
|
2016-07-01 23:54:17 +00:00
|
|
|
gem 'after_commit_queue', '~> 1.3.0'
|
2013-02-14 15:33:20 +00:00
|
|
|
|
2012-08-11 19:59:56 +00:00
|
|
|
# Issue tags
|
2016-10-03 21:54:52 +00:00
|
|
|
gem 'acts-as-taggable-on', '~> 4.0'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
|
|
|
# Background jobs
|
2017-04-26 14:59:48 +00:00
|
|
|
gem 'sidekiq', '~> 5.0'
|
2017-05-10 15:48:09 +00:00
|
|
|
gem 'sidekiq-cron', '~> 0.6.0'
|
2016-07-01 23:54:17 +00:00
|
|
|
gem 'redis-namespace', '~> 1.5.2'
|
2016-11-04 18:53:12 +00:00
|
|
|
gem 'sidekiq-limit_fetch', '~> 3.4'
|
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
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'rainbow', '~> 2.1.0'
|
2012-08-11 19:59:56 +00:00
|
|
|
|
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
|
|
|
|
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
|
|
|
|
2013-03-06 15:30:48 +00:00
|
|
|
# Cache
|
2016-11-04 18:48:05 +00:00
|
|
|
gem 'redis-rails', '~> 5.0.1'
|
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
|
2016-10-19 21:58:48 +00:00
|
|
|
gem 'jira-ruby', '~> 1.1.2'
|
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
|
|
|
|
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
|
|
|
|
gem 'kubeclient', '~> 2.2.0'
|
|
|
|
|
2013-05-09 05:00:56 +00:00
|
|
|
# d3
|
2016-01-02 02:34:49 +00:00
|
|
|
gem 'd3_rails', '~> 3.5.0'
|
2013-05-09 05:00:56 +00:00
|
|
|
|
|
|
|
# underscore-rails
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'underscore-rails', '~> 1.8.0'
|
2013-05-09 05:00:56 +00:00
|
|
|
|
2013-07-10 10:48:03 +00:00
|
|
|
# Sanitize user input
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'sanitize', '~> 2.0'
|
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
|
2016-07-01 23:14:12 +00:00
|
|
|
gem 'loofah', '~> 2.0.3'
|
2015-09-13 03:54:06 +00:00
|
|
|
|
2016-03-01 12:36:50 +00:00
|
|
|
# Working with license
|
2017-02-22 18:38:10 +00:00
|
|
|
gem 'licensee', '~> 8.7.0'
|
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
|
2015-11-09 12:40:29 +00:00
|
|
|
gem 'charlock_holmes', '~> 0.7.3'
|
2015-03-15 14:42:31 +00:00
|
|
|
|
2016-09-16 17:55:00 +00:00
|
|
|
# Faster JSON
|
|
|
|
gem 'oj', '~> 2.17.4'
|
|
|
|
|
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 'coffee-rails', '~> 4.1.0'
|
|
|
|
gem 'uglifier', '~> 2.7.2'
|
2013-12-06 15:04:50 +00:00
|
|
|
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'addressable', '~> 2.3.8'
|
|
|
|
gem 'bootstrap-sass', '~> 3.3.0'
|
2017-03-07 00:01:17 +00:00
|
|
|
gem 'font-awesome-rails', '~> 4.7'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'gemojione', '~> 3.0'
|
|
|
|
gem 'gon', '~> 6.1.0'
|
2015-10-26 09:39:33 +00:00
|
|
|
gem 'jquery-atwho-rails', '~> 1.3.2'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'jquery-rails', '~> 4.1.0'
|
|
|
|
gem 'request_store', '~> 1.3'
|
|
|
|
gem 'select2-rails', '~> 3.5.9'
|
|
|
|
gem 'virtus', '~> 1.0.1'
|
|
|
|
gem 'net-ssh', '~> 3.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
|
2017-03-25 17:09:01 +00:00
|
|
|
gem 'sentry-raven', '~> 2.4.0'
|
2016-01-22 21:04:22 +00:00
|
|
|
|
2016-01-28 16:54:13 +00:00
|
|
|
gem 'premailer-rails', '~> 1.9.0'
|
|
|
|
|
2017-04-13 03:41:46 +00:00
|
|
|
# I18n
|
2017-05-05 18:10:46 +00:00
|
|
|
gem 'ruby_parser', '~> 3.8.4', require: false
|
2017-04-13 03:41:46 +00:00
|
|
|
gem 'gettext_i18n_rails', '~> 1.8.0'
|
2017-04-15 15:07:31 +00:00
|
|
|
gem 'gettext_i18n_rails_js', '~> 1.2.0'
|
2017-04-13 03:41:46 +00:00
|
|
|
gem 'gettext', '~> 3.2.2', require: false, group: :development
|
|
|
|
|
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-17 16:17:18 +00:00
|
|
|
gem 'allocations', '~> 1.0', require: false, platform: :mri
|
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
|
|
|
|
end
|
|
|
|
|
2011-10-27 19:37:17 +00:00
|
|
|
group :development do
|
2016-07-01 23:54:17 +00:00
|
|
|
gem 'foreman', '~> 0.78.0'
|
2017-03-25 16:23:23 +00:00
|
|
|
gem 'brakeman', '~> 3.6.0', 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
|
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
|
|
|
|
2016-01-13 02:34:47 +00:00
|
|
|
gem 'awesome_print', '~> 1.2.0', require: false
|
2015-08-26 01:42:46 +00:00
|
|
|
gem 'fuubar', '~> 2.0.0'
|
|
|
|
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'database_cleaner', '~> 1.5.0'
|
2016-12-08 06:30:07 +00:00
|
|
|
gem 'factory_girl_rails', '~> 4.7.0'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'rspec-rails', '~> 3.5.0'
|
|
|
|
gem 'rspec-retry', '~> 0.4.5'
|
|
|
|
gem 'spinach-rails', '~> 0.2.1'
|
2016-03-09 13:12:08 +00:00
|
|
|
gem 'spinach-rerun-reporter', '~> 0.0.2'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'rspec_profiling', '~> 0.0.5'
|
2017-04-26 14:46:26 +00:00
|
|
|
gem 'rspec-set', '~> 0.1.3'
|
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-02-08 18:41:27 +00:00
|
|
|
gem 'capybara', '~> 2.6.2'
|
2015-06-17 22:05:48 +00:00
|
|
|
gem 'capybara-screenshot', '~> 1.0.0'
|
2017-02-08 18:41:27 +00:00
|
|
|
gem 'poltergeist', '~> 1.9.0'
|
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'
|
|
|
|
gem 'spring-commands-spinach', '~> 1.1.0'
|
2015-08-26 01:42:46 +00:00
|
|
|
|
2017-02-22 18:43:48 +00:00
|
|
|
gem 'rubocop', '~> 0.47.1', require: false
|
2017-04-08 00:22:29 +00:00
|
|
|
gem 'rubocop-rspec', '~> 1.15.0', require: false
|
2016-03-11 19:33:43 +00:00
|
|
|
gem 'scss_lint', '~> 0.47.0', require: false
|
2017-02-22 21:29:10 +00:00
|
|
|
gem 'haml_lint', '~> 0.21.0', require: false
|
2017-03-25 16:57:22 +00:00
|
|
|
gem 'simplecov', '~> 0.14.0', require: false
|
2017-03-25 16:51:46 +00:00
|
|
|
gem 'flay', '~> 2.8.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
|
|
|
|
2016-07-01 23:54:17 +00:00
|
|
|
gem 'license_finder', '~> 2.1.0', require: false
|
|
|
|
gem 'knapsack', '~> 1.11.0'
|
2016-10-17 10:52:16 +00:00
|
|
|
|
|
|
|
gem 'activerecord_sane_schema_dumper', '0.2'
|
2016-11-04 11:43:02 +00:00
|
|
|
|
|
|
|
gem 'stackprof', '~> 0.2.10'
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
group :test do
|
2015-06-10 05:38:36 +00:00
|
|
|
gem 'shoulda-matchers', '~> 2.8.0', require: false
|
2015-05-21 22:41:31 +00:00
|
|
|
gem 'email_spec', '~> 1.6.0'
|
2016-08-01 17:38:46 +00:00
|
|
|
gem 'json-schema', '~> 2.6.2'
|
2017-03-25 17:01:11 +00:00
|
|
|
gem 'webmock', '~> 1.24.0'
|
Fix race conditions for AuthorizedProjectsWorker
There were two cases that could be problematic:
1. Because sometimes AuthorizedProjectsWorker would be scheduled in a
transaction it was possible for a job to run/complete before a
COMMIT; resulting in it either producing an error, or producing no
new data.
2. When scheduling jobs the code would not wait until completion. This
could lead to a user creating a project and then immediately trying
to push to it. Usually this will work fine, but given enough load it
might take a few seconds before a user has access.
The first one is problematic, the second one is mostly just annoying
(but annoying enough to warrant a solution).
This commit changes two things to deal with this:
1. Sidekiq scheduling now takes places after a COMMIT, this is ensured
by scheduling using Rails' after_commit hook instead of doing so in
an arbitrary method.
2. When scheduling jobs the calling thread now waits for all jobs to
complete.
Solution 2 requires tracking of job completions. Sidekiq provides a way
to find a job by its ID, but this involves scanning over the entire
queue; something that is very in-efficient for large queues. As such a
more efficient solution is necessary. There are two main Gems that can
do this in a more efficient manner:
* sidekiq-status
* sidekiq_status
No, this is not a joke. Both Gems do a similar thing (but slightly
different), and the only difference in their name is a dash vs an
underscore. Both Gems however provide far more than just checking if a
job has been completed, and both have their problems. sidekiq-status
does not appear to be actively maintained, with the last release being
in 2015. It also has some issues during testing as API calls are not
stubbed in any way. sidekiq_status on the other hand does not appear to
be very popular, and introduces a similar amount of code.
Because of this I opted to write a simple home grown solution. After
all, all we need is storing a job ID somewhere so we can efficiently
look it up; we don't need extra web UIs (as provided by sidekiq-status)
or complex APIs to update progress, etc.
This is where Gitlab::SidekiqStatus comes in handy. This namespace
contains some code used for tracking, removing, and looking up job IDs;
all without having to scan over an entire queue. Data is removed
explicitly, but also expires automatically just in case.
Using this API we can now schedule jobs in a fork-join like manner: we
schedule the jobs in Sidekiq, process them in parallel, then wait for
completion. By using Sidekiq we can leverage all the benefits such as
being able to scale across multiple cores and hosts, retrying failed
jobs, etc.
The one downside is that we need to make sure we can deal with
unexpected increases in job processing timings. To deal with this the
class Gitlab::JobWaiter (used for waiting for jobs to complete) will
only wait a number of seconds (30 by default). Once this timeout is
reached it will simply return.
For GitLab.com almost all AuthorizedProjectWorker jobs complete in
seconds, only very rarely do we spike to job timings of around a minute.
These in turn seem to be the result of external factors (e.g. deploys),
in which case a user is most likely not able to use the system anyway.
In short, this new solution should ensure that jobs are processed
properly and that in almost all cases a user has access to their
resources whenever they need to have access.
2017-01-22 17:22:02 +00:00
|
|
|
gem 'test_after_commit', '~> 1.1'
|
2016-07-01 23:54:17 +00:00
|
|
|
gem 'sham_rack', '~> 1.3.6'
|
2016-08-26 07:19:32 +00:00
|
|
|
gem 'timecop', '~> 0.8.0'
|
2017-03-10 02:28:20 +00:00
|
|
|
gem 'concurrent-ruby', '~> 1.0.5'
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
2012-08-23 23:21:20 +00:00
|
|
|
|
2016-12-18 04:15:31 +00:00
|
|
|
gem 'octokit', '~> 4.6.2'
|
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
|
|
|
|
2016-08-25 14:42:58 +00:00
|
|
|
gem 'ruby-prof', '~> 0.16.2'
|
2016-07-15 15:46:39 +00:00
|
|
|
|
2015-08-26 01:42:46 +00:00
|
|
|
# OAuth
|
2017-04-12 01:29:30 +00:00
|
|
|
gem 'oauth2', '~> 1.3.0'
|
2015-08-26 01:42:46 +00:00
|
|
|
|
|
|
|
# Soft deletion
|
2016-12-05 00:28:36 +00:00
|
|
|
gem 'paranoia', '~> 2.2'
|
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
|
|
|
|
|
|
|
# Gitaly GRPC client
|
2017-05-05 14:55:12 +00:00
|
|
|
gem 'gitaly', '~> 0.7.0'
|
2017-04-04 14:06:07 +00:00
|
|
|
|
|
|
|
gem 'toml-rb', '~> 0.3.15', require: false
|
2017-05-31 21:06:01 +00:00
|
|
|
|
|
|
|
# Feature toggles
|
|
|
|
gem 'flipper', '~> 0.10.2'
|
|
|
|
gem 'flipper-active_record', '~> 0.10.2'
|