Merge branch 'master' into diverging-branch-graphs
Showing
source "https://rubygems.org" | source "https://rubygems.org" | ||
gem 'rails', '4.1.12' | gem 'rails', '4.2.4' | ||
gem 'rails-deprecated_sanitizer', '~> 1.0.3' | |||
# Responders respond_to and respond_with | |||
gem 'responders', '~> 2.0' | |||
# Specify a sprockets version due to security issue | # Specify a sprockets version due to security issue | ||
# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY | # See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY | ||
... | @@ -16,7 +20,7 @@ gem "pg", '~> 0.18.2', group: :postgres | ... | @@ -16,7 +20,7 @@ gem "pg", '~> 0.18.2', group: :postgres |
# Authentication libraries | # Authentication libraries | ||
gem 'devise', '~> 3.5.2' | gem 'devise', '~> 3.5.2' | ||
gem 'devise-async', '~> 0.9.0' | gem 'devise-async', '~> 0.9.0' | ||
gem 'doorkeeper', '~> 2.1.3' | gem 'doorkeeper', '~> 2.2.0' | ||
gem 'omniauth', '~> 1.2.2' | gem 'omniauth', '~> 1.2.2' | ||
gem 'omniauth-bitbucket', '~> 0.0.2' | gem 'omniauth-bitbucket', '~> 0.0.2' | ||
gem 'omniauth-facebook', '~> 3.0.0' | gem 'omniauth-facebook', '~> 3.0.0' | ||
... | @@ -28,7 +32,7 @@ gem 'omniauth-saml', '~> 1.4.0' | ... | @@ -28,7 +32,7 @@ gem 'omniauth-saml', '~> 1.4.0' |
gem 'omniauth-shibboleth', '~> 1.2.0' | gem 'omniauth-shibboleth', '~> 1.2.0' | ||
gem 'omniauth-twitter', '~> 1.2.0' | gem 'omniauth-twitter', '~> 1.2.0' | ||
gem 'omniauth_crowd' | gem 'omniauth_crowd' | ||
gem 'rack-oauth2', '~> 1.0.5' | gem 'rack-oauth2', '~> 1.2.1' | ||
# Two-factor authentication | # Two-factor authentication | ||
gem 'devise-two-factor', '~> 2.0.0' | gem 'devise-two-factor', '~> 2.0.0' | ||
... | @@ -62,9 +66,6 @@ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' | ... | @@ -62,9 +66,6 @@ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' |
# based on human-friendly examples | # based on human-friendly examples | ||
gem "stamp", '~> 0.6.0' | gem "stamp", '~> 0.6.0' | ||
# Enumeration fields | |||
gem 'enumerize', '~> 0.7.0' | |||
# Pagination | # Pagination | ||
gem "kaminari", "~> 0.16.3" | gem "kaminari", "~> 0.16.3" | ||
... | @@ -95,9 +96,10 @@ gem 'redcarpet', '~> 3.3.3' | ... | @@ -95,9 +96,10 @@ gem 'redcarpet', '~> 3.3.3' |
gem 'RedCloth', '~> 4.2.9' | gem 'RedCloth', '~> 4.2.9' | ||
gem 'rdoc', '~>3.6' | gem 'rdoc', '~>3.6' | ||
gem 'org-ruby', '~> 0.9.12' | gem 'org-ruby', '~> 0.9.12' | ||
gem 'creole', '~>0.3.6' | gem 'creole', '~> 0.5.0' | ||
gem 'wikicloth', '0.8.1' | gem 'wikicloth', '0.8.1' | ||
gem 'asciidoctor', '~> 1.5.2' | gem 'asciidoctor', '~> 1.5.2' | ||
gem 'net-ssh', '~> 3.0.1' | |||
# Diffs | # Diffs | ||
gem 'diffy', '~> 3.0.3' | gem 'diffy', '~> 3.0.3' | ||
... | @@ -125,8 +127,7 @@ gem 'sidetiq', '~> 0.6.3' | ... | @@ -125,8 +127,7 @@ gem 'sidetiq', '~> 0.6.3' |
gem "httparty", '~> 0.13.3' | gem "httparty", '~> 0.13.3' | ||
# Colored output to console | # Colored output to console | ||
gem "colored", '~> 1.2' | gem "colorize", '~> 0.7.0' | ||
gem "colorize", '~> 0.5.8' | |||
# GitLab settings | # GitLab settings | ||
gem 'settingslogic', '~> 2.0.9' | gem 'settingslogic', '~> 2.0.9' | ||
... | @@ -154,7 +155,7 @@ gem "gemnasium-gitlab-service", "~> 0.2" | ... | @@ -154,7 +155,7 @@ gem "gemnasium-gitlab-service", "~> 0.2" |
gem "slack-notifier", "~> 1.2.0" | gem "slack-notifier", "~> 1.2.0" | ||
# Asana integration | # Asana integration | ||
gem 'asana', '~> 0.0.6' | gem 'asana', '~> 0.4.0' | ||
# FogBugz integration | # FogBugz integration | ||
gem 'ruby-fogbugz', '~> 0.2.1' | gem 'ruby-fogbugz', '~> 0.2.1' | ||
... | @@ -187,13 +188,13 @@ gem "sass-rails", '~> 4.0.5' | ... | @@ -187,13 +188,13 @@ gem "sass-rails", '~> 4.0.5' |
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.0.1' | gem 'jquery-turbolinks', '~> 2.1.0' | ||
gem 'addressable', '~> 2.3.8' | gem 'addressable', '~> 2.3.8' | ||
gem 'bootstrap-sass', '~> 3.0' | gem 'bootstrap-sass', '~> 3.0' | ||
gem 'font-awesome-rails', '~> 4.2' | gem 'font-awesome-rails', '~> 4.2' | ||
gem 'gitlab_emoji', '~> 0.1' | gem 'gitlab_emoji', '~> 0.1' | ||
gem 'gon', '~> 5.0.0' | gem 'gon', '~> 6.0.1' | ||
gem 'jquery-atwho-rails', '~> 1.3.2' | gem 'jquery-atwho-rails', '~> 1.3.2' | ||
gem 'jquery-rails', '~> 3.1.3' | gem 'jquery-rails', '~> 3.1.3' | ||
gem 'jquery-scrollto-rails', '~> 1.4.3' | gem 'jquery-scrollto-rails', '~> 1.4.3' | ||
... | @@ -214,6 +215,7 @@ group :development do | ... | @@ -214,6 +215,7 @@ group :development do |
gem 'rerun', '~> 0.10.0' | gem 'rerun', '~> 0.10.0' | ||
gem 'bullet', require: false | gem 'bullet', require: false | ||
gem 'rblineprof', platform: :mri, require: false | gem 'rblineprof', platform: :mri, require: false | ||
gem 'web-console', '~> 2.0' | |||
# Better errors handler | # Better errors handler | ||
gem 'better_errors', '~> 1.0.1' | gem 'better_errors', '~> 1.0.1' | ||
... | @@ -261,6 +263,7 @@ group :development, :test do | ... | @@ -261,6 +263,7 @@ group :development, :test do |
gem 'simplecov', '~> 0.10.0', require: false | gem 'simplecov', '~> 0.10.0', require: false | ||
gem 'flog', require: false | gem 'flog', require: false | ||
gem 'flay', require: false | gem 'flay', require: false | ||
gem 'bundler-audit', require: false | |||
gem 'benchmark-ips', require: false | gem 'benchmark-ips', require: false | ||
end | end | ||
... | @@ -269,7 +272,7 @@ group :test do | ... | @@ -269,7 +272,7 @@ group :test do |
gem 'shoulda-matchers', '~> 2.8.0', require: false | gem 'shoulda-matchers', '~> 2.8.0', require: false | ||
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.2.2' | gem 'test_after_commit', '~> 0.4.2' | ||
gem 'sham_rack' | gem 'sham_rack' | ||
end | end | ||
... | ... |
This diff is collapsed.
![app/assets/images/icon-link.png](https://lab.nexedi.com/jerome/gitlab-ce/-/raw/64ca9cf3e4a56a19f09160a91c5433d2ddb632cf/app/assets/images/icon-link.png)
app/helpers/button_helper.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.
app/models/lfs_object.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.
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.
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.
bin/ci/upgrade.rb
100644 → 100755
File mode changed from 100644 to 100755
This diff is collapsed.
This diff is collapsed.
bin/setup
0 → 100755
This diff is collapsed.
bin/upgrade.rb
100644 → 100755
File mode changed from 100644 to 100755
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.
doc/api/tags.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/ci/img/builds_tab.png
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.
doc/workflow/award_emoji.png
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.
doc/workflow/milestones.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/workflow/releases.md
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.
lib/api/tags.rb
0 → 100644
This diff is collapsed.
lib/award_emoji.rb
0 → 100644
This diff is collapsed.
lib/backup/lfs.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.
lib/gitlab/lfs/response.rb
0 → 100644
This diff is collapsed.
lib/gitlab/lfs/router.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.
lib/gitlab/sql/union.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/tasks/grape.rake
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.
File moved
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.