Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit
Showing
.flayignore
0 → 100644
GITLAB_WORKHORSE
0 → 100644
GITLAB_WORKHORSE_VERSION
0 → 100644
... | ... | @@ -19,6 +19,7 @@ gem 'devise-async', '~> 0.9.0' |
gem 'doorkeeper', '~> 2.1.3' | ||
gem 'omniauth', '~> 1.2.2' | ||
gem 'omniauth-bitbucket', '~> 0.0.2' | ||
gem 'omniauth-facebook', '~> 3.0.0' | ||
gem 'omniauth-github', '~> 1.1.1' | ||
gem 'omniauth-gitlab', '~> 1.0.0' | ||
gem 'omniauth-google-oauth2', '~> 0.2.0' | ||
... | ... | @@ -39,7 +40,7 @@ gem "browser", '~> 1.0.0' |
# Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | ||
gem "gitlab_git", '~> 7.2.19' | ||
gem "gitlab_git", '~> 7.2.20' | ||
# LDAP Auth | ||
# GitLab fork with several improvements to original library. For full list of changes | ||
... | ... | @@ -50,20 +51,16 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap" |
gem 'gollum-lib', '~> 4.0.2' | ||
# Language detection | ||
# GitLab fork of linguist does not require pygments/python dependency. | ||
# New version of original gem also dropped pygments support but it has strict | ||
# dependency to unstable rugged version. We have internal issue for replacing | ||
# fork with original gem when we meet on same rugged version - https://dev.gitlab.org/gitlab/gitlabhq/issues/2052. | ||
gem "gitlab-linguist", "~> 3.0.1", require: "linguist" | ||
gem "github-linguist", "~> 4.7.0", require: "linguist" | ||
# API | ||
gem 'grape', '~> 0.6.1' | ||
gem 'grape', '~> 0.13.0' | ||
gem 'grape-entity', '~> 0.4.2' | ||
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' | ||
# Format dates and times | ||
# based on human-friendly examples | ||
gem "stamp", '~> 0.5.0' | ||
gem "stamp", '~> 0.6.0' | ||
# Enumeration fields | ||
gem 'enumerize', '~> 0.7.0' | ||
... | ... | @@ -94,7 +91,7 @@ gem "seed-fu", '~> 2.3.5' |
gem 'html-pipeline', '~> 1.11.0' | ||
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' | ||
gem 'github-markup', '~> 1.3.1' | ||
gem 'redcarpet', '~> 3.3.2' | ||
gem 'redcarpet', '~> 3.3.3' | ||
gem 'RedCloth', '~> 4.2.9' | ||
gem 'rdoc', '~>3.6' | ||
gem 'org-ruby', '~> 0.9.12' | ||
... | ... | @@ -112,7 +109,7 @@ group :unicorn do |
end | ||
# State machine | ||
gem "state_machine", '~> 1.2.0' | ||
gem "state_machines-activerecord", '~> 0.3.0' | ||
# Run events after state machine commits | ||
gem 'after_commit_queue' | ||
... | ... | @@ -184,7 +181,7 @@ gem 'ace-rails-ap', '~> 2.0.1' |
gem 'mousetrap-rails', '~> 1.4.6' | ||
# Detect and convert string character encoding | ||
gem 'charlock_holmes', '~> 0.6.9.4' | ||
gem 'charlock_holmes', '~> 0.7.3' | ||
gem "sass-rails", '~> 4.0.5' | ||
gem "coffee-rails", '~> 4.1.0' | ||
... | ... | @@ -197,11 +194,11 @@ gem 'bootstrap-sass', '~> 3.0' |
gem 'font-awesome-rails', '~> 4.2' | ||
gem 'gitlab_emoji', '~> 0.1' | ||
gem 'gon', '~> 5.0.0' | ||
gem 'jquery-atwho-rails', '~> 1.0.0' | ||
gem 'jquery-atwho-rails', '~> 1.3.2' | ||
gem 'jquery-rails', '~> 3.1.3' | ||
gem 'jquery-scrollto-rails', '~> 1.4.3' | ||
gem 'jquery-ui-rails', '~> 4.2.1' | ||
gem 'nprogress-rails', '~> 0.1.2.3' | ||
gem 'nprogress-rails', '~> 0.1.6.7' | ||
gem 'raphael-rails', '~> 2.1.2' | ||
gem 'request_store', '~> 1.2.0' | ||
gem 'select2-rails', '~> 3.5.9' | ||
... | ... | @@ -214,11 +211,9 @@ group :development do |
gem "annotate", "~> 2.6.0" | ||
gem "letter_opener", '~> 1.1.2' | ||
gem 'quiet_assets', '~> 1.0.2' | ||
gem 'rack-mini-profiler', '~> 0.9.0', require: false | ||
gem 'rerun', '~> 0.10.0' | ||
gem 'bullet', require: false | ||
gem 'active_record_query_trace', require: false | ||
gem 'rack-lineprof', platform: :mri | ||
gem 'rblineprof', platform: :mri, require: false | ||
# Better errors handler | ||
gem 'better_errors', '~> 1.0.1' | ||
... | ... | @@ -264,6 +259,8 @@ group :development, :test do |
gem 'rubocop', '~> 0.28.0', require: false | ||
gem 'coveralls', '~> 0.8.2', require: false | ||
gem 'simplecov', '~> 0.10.0', require: false | ||
gem 'flog', require: false | ||
gem 'flay', require: false | ||
gem 'benchmark-ips', require: false | ||
end | ||
... | ... |
app/assets/fonts/SourceSansPro-Black.ttf
100755 → 100644
No preview for this file type
File added
app/assets/fonts/SourceSansPro-Bold.ttf
100755 → 100644
File mode changed from 100755 to 100644
File added
app/assets/fonts/SourceSansPro-ExtraLight.ttf
100755 → 100644
No preview for this file type
File added
File added
app/assets/fonts/SourceSansPro-Light.ttf
100755 → 100644
File mode changed from 100755 to 100644
File added
app/assets/fonts/SourceSansPro-Regular.ttf
100755 → 100644
File mode changed from 100755 to 100644
app/assets/fonts/SourceSansPro-Semibold.ttf
100755 → 100644
File mode changed from 100755 to 100644
File added
2.9 KB
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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/global_label.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.
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.
app/models/release.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.
This diff is collapsed.
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/views/shared/_logo.svg
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.
doc/api/tags.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.
doc/integration/facebook.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.
doc/update/8.0-to-8.1.md
0 → 100644
This diff is collapsed.
doc/update/8.1-to-8.2.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.
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.
This diff is collapsed.
This diff is collapsed.
lib/api/tags.rb
0 → 100644
This diff is collapsed.
lib/backup/artifacts.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/backup/files.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.
lib/ci/status.rb
0 → 100644
This diff is collapsed.
lib/file_streamer.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/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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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/sherlock.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/sherlock/query.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.
lib/tasks/flay.rake
0 → 100644
This diff is collapsed.
lib/tasks/flog.rake
0 → 100644
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.
lib/uploaded_file.rb
0 → 100644
This diff is collapsed.
shared/.gitkeep
0 → 100644
shared/artifacts/.gitkeep
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.
spec/factories/releases.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.
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.
spec/models/release_spec.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.