Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-build-name
* upstream/master: (117 commits) spec and fix for sanitize method remove fix validatable import url migration Fix typo in spec Update Gemfile.lock after versions were added in !5078 Add more comments to regex Add changelog item Add blockquote fence syntax to Markdown Fix typo and explain the precedence of STDERR and STDOUT Add changelog entry for !4399 Add reminder to not paste private SSH keys Make subnavigation a bit darker color Update ui_guide.md with button capitalize rule Re-use queries in reference parsers Use btn-danger for delete button. Update New Snippet buttons. Run bundle install. Add min attribute to project_limit field on user's form Wrong gitlab-shell version API: Expose shared projects in a group Memoize MR merged/closed events retrieval ...
Showing
source "https://rubygems.org" | source 'https://rubygems.org' | ||
gem 'rails', '4.2.6' | gem 'rails', '4.2.6' | ||
gem 'rails-deprecated_sanitizer', '~> 1.0.3' | gem 'rails-deprecated_sanitizer', '~> 1.0.3' | ||
... | @@ -11,11 +11,11 @@ gem 'responders', '~> 2.0' | ... | @@ -11,11 +11,11 @@ gem 'responders', '~> 2.0' |
gem 'sprockets', '~> 3.6.0' | gem 'sprockets', '~> 3.6.0' | ||
# Default values for AR models | # Default values for AR models | ||
gem "default_value_for", "~> 3.0.0" | gem 'default_value_for', '~> 3.0.0' | ||
# Supported DBs | # Supported DBs | ||
gem "mysql2", '~> 0.3.16', group: :mysql | gem 'mysql2', '~> 0.3.16', group: :mysql | ||
gem "pg", '~> 0.18.2', group: :postgres | gem 'pg', '~> 0.18.2', group: :postgres | ||
# Authentication libraries | # Authentication libraries | ||
gem 'devise', '~> 4.0' | gem 'devise', '~> 4.0' | ||
... | @@ -28,7 +28,7 @@ gem 'omniauth-cas3', '~> 1.1.2' | ... | @@ -28,7 +28,7 @@ gem 'omniauth-cas3', '~> 1.1.2' |
gem 'omniauth-facebook', '~> 3.0.0' | gem 'omniauth-facebook', '~> 3.0.0' | ||
gem 'omniauth-github', '~> 1.1.1' | gem 'omniauth-github', '~> 1.1.1' | ||
gem 'omniauth-gitlab', '~> 1.0.0' | gem 'omniauth-gitlab', '~> 1.0.0' | ||
gem 'omniauth-google-oauth2', '~> 0.2.0' | gem 'omniauth-google-oauth2', '~> 0.4.1' | ||
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos | gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos | ||
gem 'omniauth-saml', '~> 1.6.0' | gem 'omniauth-saml', '~> 1.6.0' | ||
gem 'omniauth-shibboleth', '~> 1.2.0' | gem 'omniauth-shibboleth', '~> 1.2.0' | ||
... | @@ -48,16 +48,16 @@ gem 'attr_encrypted', '~> 3.0.0' | ... | @@ -48,16 +48,16 @@ gem 'attr_encrypted', '~> 3.0.0' |
gem 'u2f', '~> 0.2.1' | gem 'u2f', '~> 0.2.1' | ||
# Browser detection | # Browser detection | ||
gem "browser", '~> 2.2' | gem 'browser', '~> 2.2' | ||
# Extracting information from a git repository | # Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | # Provide access to Gitlab::Git library | ||
gem "gitlab_git", '~> 10.2' | gem 'gitlab_git', '~> 10.2' | ||
# LDAP Auth | # LDAP Auth | ||
# GitLab fork with several improvements to original library. For full list of changes | # GitLab fork with several improvements to original library. For full list of changes | ||
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master | # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master | ||
gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap" | gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap' | ||
# Git Wiki | # Git Wiki | ||
# Required manually in config/initializers/gollum.rb to control load order | # Required manually in config/initializers/gollum.rb to control load order | ||
... | @@ -65,7 +65,7 @@ gem 'gollum-lib', '~> 4.1.0', require: false | ... | @@ -65,7 +65,7 @@ gem 'gollum-lib', '~> 4.1.0', require: false |
gem 'gollum-rugged_adapter', '~> 0.4.2', require: false | gem 'gollum-rugged_adapter', '~> 0.4.2', require: false | ||
# Language detection | # Language detection | ||
gem "github-linguist", "~> 4.7.0", require: "linguist" | gem 'github-linguist', '~> 4.7.0', require: 'linguist' | ||
# API | # API | ||
gem 'grape', '~> 0.13.0' | gem 'grape', '~> 0.13.0' | ||
... | @@ -73,13 +73,13 @@ gem 'grape-entity', '~> 0.4.2' | ... | @@ -73,13 +73,13 @@ gem 'grape-entity', '~> 0.4.2' |
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' | gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' | ||
# Pagination | # Pagination | ||
gem "kaminari", "~> 0.17.0" | gem 'kaminari', '~> 0.17.0' | ||
# HAML | # HAML | ||
gem 'hamlit', '~> 2.5' | gem 'hamlit', '~> 2.5' | ||
# Files attachments | # Files attachments | ||
gem "carrierwave", '~> 0.10.0' | gem 'carrierwave', '~> 0.10.0' | ||
# Drag and Drop UI | # Drag and Drop UI | ||
gem 'dropzonejs-rails', '~> 0.7.1' | gem 'dropzonejs-rails', '~> 0.7.1' | ||
... | @@ -94,13 +94,13 @@ gem 'fog-openstack', '~> 0.1' | ... | @@ -94,13 +94,13 @@ gem 'fog-openstack', '~> 0.1' |
gem 'fog-rackspace', '~> 0.1.1' | gem 'fog-rackspace', '~> 0.1.1' | ||
# for aws storage | # for aws storage | ||
gem "unf", '~> 0.1.4' | gem 'unf', '~> 0.1.4' | ||
# Authorization | # Authorization | ||
gem "six", '~> 0.2.0' | gem 'six', '~> 0.2.0' | ||
# Seed data | # Seed data | ||
gem "seed-fu", '~> 2.3.5' | gem 'seed-fu', '~> 2.3.5' | ||
# Markdown and HTML processing | # Markdown and HTML processing | ||
gem 'html-pipeline', '~> 1.11.0' | gem 'html-pipeline', '~> 1.11.0' | ||
... | @@ -124,29 +124,29 @@ gem 'diffy', '~> 3.0.3' | ... | @@ -124,29 +124,29 @@ gem 'diffy', '~> 3.0.3' |
# Application server | # Application server | ||
group :unicorn do | group :unicorn do | ||
gem "unicorn", '~> 4.9.0' | gem 'unicorn', '~> 4.9.0' | ||
gem 'unicorn-worker-killer', '~> 0.4.2' | gem 'unicorn-worker-killer', '~> 0.4.2' | ||
end | end | ||
# State machine | # State machine | ||
gem "state_machines-activerecord", '~> 0.4.0' | gem 'state_machines-activerecord', '~> 0.4.0' | ||
# Run events after state machine commits | # Run events after state machine commits | ||
gem 'after_commit_queue' | gem 'after_commit_queue', '~> 1.3.0' | ||
# Issue tags | # Issue tags | ||
gem 'acts-as-taggable-on', '~> 3.4' | gem 'acts-as-taggable-on', '~> 3.4' | ||
# Background jobs | # Background jobs | ||
gem 'sinatra', '~> 1.4.4', require: nil | gem 'sinatra', '~> 1.4.4', require: false | ||
gem 'sidekiq', '~> 4.0' | gem 'sidekiq', '~> 4.0' | ||
gem 'sidekiq-cron', '~> 0.4.0' | gem 'sidekiq-cron', '~> 0.4.0' | ||
gem 'redis-namespace' | gem 'redis-namespace', '~> 1.5.2' | ||
# HTTP requests | # HTTP requests | ||
gem "httparty", '~> 0.13.3' | gem 'httparty', '~> 0.13.3' | ||
# Colored output to console | # Colored output to console | ||
gem "rainbow", '~> 2.1.0' | gem 'rainbow', '~> 2.1.0' | ||
# GitLab settings | # GitLab settings | ||
gem 'settingslogic', '~> 2.0.9' | gem 'settingslogic', '~> 2.0.9' | ||
... | @@ -156,7 +156,7 @@ gem 'settingslogic', '~> 2.0.9' | ... | @@ -156,7 +156,7 @@ gem 'settingslogic', '~> 2.0.9' |
gem 'version_sorter', '~> 2.0.0' | gem 'version_sorter', '~> 2.0.0' | ||
# Cache | # Cache | ||
gem "redis-rails", '~> 4.0.0' | gem 'redis-rails', '~> 4.0.0' | ||
# Redis | # Redis | ||
gem 'redis', '~> 3.2' | gem 'redis', '~> 3.2' | ||
... | @@ -169,13 +169,13 @@ gem 'tinder', '~> 1.10.0' | ... | @@ -169,13 +169,13 @@ gem 'tinder', '~> 1.10.0' |
gem 'hipchat', '~> 1.5.0' | gem 'hipchat', '~> 1.5.0' | ||
# Flowdock integration | # Flowdock integration | ||
gem "gitlab-flowdock-git-hook", "~> 1.0.1" | gem 'gitlab-flowdock-git-hook', '~> 1.0.1' | ||
# Gemnasium integration | # Gemnasium integration | ||
gem "gemnasium-gitlab-service", "~> 0.2" | gem 'gemnasium-gitlab-service', '~> 0.2' | ||
# Slack integration | # Slack integration | ||
gem "slack-notifier", "~> 1.2.0" | gem 'slack-notifier', '~> 1.2.0' | ||
# Asana integration | # Asana integration | ||
gem 'asana', '~> 0.4.0' | gem 'asana', '~> 0.4.0' | ||
... | @@ -187,20 +187,20 @@ gem 'ruby-fogbugz', '~> 0.2.1' | ... | @@ -187,20 +187,20 @@ gem 'ruby-fogbugz', '~> 0.2.1' |
gem 'd3_rails', '~> 3.5.0' | gem 'd3_rails', '~> 3.5.0' | ||
# underscore-rails | # underscore-rails | ||
gem "underscore-rails", "~> 1.8.0" | gem 'underscore-rails', '~> 1.8.0' | ||
# Sanitize user input | # Sanitize user input | ||
gem "sanitize", '~> 2.0' | gem 'sanitize', '~> 2.0' | ||
gem 'babosa', '~> 1.0.2' | gem 'babosa', '~> 1.0.2' | ||
# Sanitizes SVG input | # Sanitizes SVG input | ||
gem "loofah", "~> 2.0.3" | gem 'loofah', '~> 2.0.3' | ||
# Working with license | # Working with license | ||
gem 'licensee', '~> 8.0.0' | gem 'licensee', '~> 8.0.0' | ||
# Protect against bruteforcing | # Protect against bruteforcing | ||
gem "rack-attack", '~> 4.3.1' | gem 'rack-attack', '~> 4.3.1' | ||
# Ace editor | # Ace editor | ||
gem 'ace-rails-ap', '~> 4.0.2' | gem 'ace-rails-ap', '~> 4.0.2' | ||
... | @@ -214,9 +214,9 @@ gem 'charlock_holmes', '~> 0.7.3' | ... | @@ -214,9 +214,9 @@ gem 'charlock_holmes', '~> 0.7.3' |
# Parse duration | # Parse duration | ||
gem 'chronic_duration', '~> 0.10.6' | gem 'chronic_duration', '~> 0.10.6' | ||
gem "sass-rails", '~> 5.0.0' | gem 'sass-rails', '~> 5.0.0' | ||
gem "coffee-rails", '~> 4.1.0' | gem 'coffee-rails', '~> 4.1.0' | ||
gem "uglifier", '~> 2.7.2' | gem 'uglifier', '~> 2.7.2' | ||
gem 'turbolinks', '~> 2.5.0' | gem 'turbolinks', '~> 2.5.0' | ||
gem 'jquery-turbolinks', '~> 2.1.0' | gem 'jquery-turbolinks', '~> 2.1.0' | ||
... | @@ -247,13 +247,13 @@ group :metrics do | ... | @@ -247,13 +247,13 @@ group :metrics do |
end | end | ||
group :development do | group :development do | ||
gem "foreman" | gem 'foreman', '~> 0.78.0' | ||
gem 'brakeman', '~> 3.3.0', require: false | gem 'brakeman', '~> 3.3.0', require: false | ||
gem 'letter_opener_web', '~> 1.3.0' | gem 'letter_opener_web', '~> 1.3.0' | ||
gem 'rerun', '~> 0.11.0' | gem 'rerun', '~> 0.11.0' | ||
gem 'bullet', require: false | gem 'bullet', '~> 5.0.0', require: false | ||
gem 'rblineprof', platform: :mri, require: false | gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false | ||
gem 'web-console', '~> 2.0' | gem 'web-console', '~> 2.0' | ||
# Better errors handler | # Better errors handler | ||
... | @@ -261,15 +261,15 @@ group :development do | ... | @@ -261,15 +261,15 @@ group :development do |
gem 'binding_of_caller', '~> 0.7.2' | gem 'binding_of_caller', '~> 0.7.2' | ||
# Docs generator | # Docs generator | ||
gem "sdoc", '~> 0.3.20' | gem 'sdoc', '~> 0.3.20' | ||
# thin instead webrick | # thin instead webrick | ||
gem 'thin', '~> 1.7.0' | gem 'thin', '~> 1.7.0' | ||
end | end | ||
group :development, :test do | group :development, :test do | ||
gem 'byebug', platform: :mri | gem 'byebug', '~> 8.2.1', platform: :mri | ||
gem 'pry-rails' | gem 'pry-rails', '~> 0.3.4' | ||
gem 'awesome_print', '~> 1.2.0', require: false | gem 'awesome_print', '~> 1.2.0', require: false | ||
gem 'fuubar', '~> 2.0.0' | gem 'fuubar', '~> 2.0.0' | ||
... | @@ -277,7 +277,7 @@ group :development, :test do | ... | @@ -277,7 +277,7 @@ group :development, :test do |
gem 'database_cleaner', '~> 1.4.0' | gem 'database_cleaner', '~> 1.4.0' | ||
gem 'factory_girl_rails', '~> 4.6.0' | gem 'factory_girl_rails', '~> 4.6.0' | ||
gem 'rspec-rails', '~> 3.5.0' | gem 'rspec-rails', '~> 3.5.0' | ||
gem 'rspec-retry' | gem 'rspec-retry', '~> 0.4.5' | ||
gem 'spinach-rails', '~> 0.2.1' | gem 'spinach-rails', '~> 0.2.1' | ||
gem 'spinach-rerun-reporter', '~> 0.0.2' | gem 'spinach-rerun-reporter', '~> 0.0.2' | ||
... | @@ -303,14 +303,14 @@ group :development, :test do | ... | @@ -303,14 +303,14 @@ group :development, :test do |
gem 'rubocop-rspec', '~> 1.5.0', require: false | gem 'rubocop-rspec', '~> 1.5.0', require: false | ||
gem 'scss_lint', '~> 0.47.0', require: false | gem 'scss_lint', '~> 0.47.0', require: false | ||
gem 'simplecov', '~> 0.11.0', require: false | gem 'simplecov', '~> 0.11.0', require: false | ||
gem 'flog', require: false | gem 'flog', '~> 4.3.2', require: false | ||
gem 'flay', require: false | gem 'flay', '~> 2.6.1', require: false | ||
gem 'bundler-audit', require: false | gem 'bundler-audit', '~> 0.5.0', require: false | ||
gem 'benchmark-ips', require: false | gem 'benchmark-ips', '~> 2.3.0', require: false | ||
gem "license_finder", require: false | gem 'license_finder', '~> 2.1.0', require: false | ||
gem 'knapsack' | gem 'knapsack', '~> 1.11.0' | ||
end | end | ||
group :test do | group :test do | ||
... | @@ -318,30 +318,30 @@ group :test do | ... | @@ -318,30 +318,30 @@ group :test do |
gem 'email_spec', '~> 1.6.0' | gem 'email_spec', '~> 1.6.0' | ||
gem 'webmock', '~> 1.21.0' | gem 'webmock', '~> 1.21.0' | ||
gem 'test_after_commit', '~> 0.4.2' | gem 'test_after_commit', '~> 0.4.2' | ||
gem 'sham_rack' | gem 'sham_rack', '~> 1.3.6' | ||
end | end | ||
group :production do | group :production do | ||
gem "gitlab_meta", '7.0' | gem 'gitlab_meta', '7.0' | ||
end | end | ||
gem "newrelic_rpm", '~> 3.14' | gem 'newrelic_rpm', '~> 3.14' | ||
gem 'octokit', '~> 4.3.0' | gem 'octokit', '~> 4.3.0' | ||
gem "mail_room", "~> 0.8" | gem 'mail_room', '~> 0.8' | ||
gem 'email_reply_parser', '~> 0.5.8' | gem 'email_reply_parser', '~> 0.5.8' | ||
## CI | ## CI | ||
gem 'activerecord-session_store', '~> 1.0.0' | gem 'activerecord-session_store', '~> 1.0.0' | ||
gem "nested_form", '~> 0.3.2' | gem 'nested_form', '~> 0.3.2' | ||
# OAuth | # OAuth | ||
gem 'oauth2', '~> 1.0.0' | gem 'oauth2', '~> 1.2.0' | ||
# Soft deletion | # Soft deletion | ||
gem "paranoia", "~> 2.0" | gem 'paranoia', '~> 2.0' | ||
# Health check | # Health check | ||
gem 'health_check', '~> 1.5.1' | gem 'health_check', '~> 1.5.1' | ||
... | ... |
File moved
app/models/diff_note.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/diff/diff_refs.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/diff/position.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/timeless.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment