Merge branch 'upstream-master' into markdown-preview
Conflicts: spec/routing/project_routing_spec.rb
Showing
... | @@ -31,13 +31,13 @@ gem 'omniauth-shibboleth' | ... | @@ -31,13 +31,13 @@ gem 'omniauth-shibboleth' |
# 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", '7.0.0.rc9' | gem "gitlab_git", '7.0.0.rc12' | ||
# Ruby/Rack Git Smart-HTTP Server Handler | # Ruby/Rack Git Smart-HTTP Server Handler | ||
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | ||
# LDAP Auth | # LDAP Auth | ||
gem 'gitlab_omniauth-ldap', '1.1.0', require: "omniauth-ldap" | gem 'gitlab_omniauth-ldap', '1.2.0', require: "omniauth-ldap" | ||
# Git Wiki | # Git Wiki | ||
gem 'gollum-lib', '~> 3.0.0' | gem 'gollum-lib', '~> 3.0.0' | ||
... | @@ -112,7 +112,7 @@ gem "acts-as-taggable-on" | ... | @@ -112,7 +112,7 @@ gem "acts-as-taggable-on" |
# Background jobs | # Background jobs | ||
gem 'slim' | gem 'slim' | ||
gem 'sinatra', require: nil | gem 'sinatra', require: nil | ||
gem 'sidekiq', '2.17.0' | gem 'sidekiq', '2.17.8' | ||
# HTTP requests | # HTTP requests | ||
gem "httparty" | gem "httparty" | ||
... | @@ -134,7 +134,7 @@ gem "redis-rails" | ... | @@ -134,7 +134,7 @@ gem "redis-rails" |
gem 'tinder', '~> 1.9.2' | gem 'tinder', '~> 1.9.2' | ||
# HipChat integration | # HipChat integration | ||
gem "hipchat", "~> 0.14.0" | gem "hipchat", "~> 1.4.0" | ||
# Flowdock integration | # Flowdock integration | ||
gem "gitlab-flowdock-git-hook", "~> 0.4.2" | gem "gitlab-flowdock-git-hook", "~> 0.4.2" | ||
... | @@ -143,7 +143,7 @@ gem "gitlab-flowdock-git-hook", "~> 0.4.2" | ... | @@ -143,7 +143,7 @@ gem "gitlab-flowdock-git-hook", "~> 0.4.2" |
gem "gemnasium-gitlab-service", "~> 0.2" | gem "gemnasium-gitlab-service", "~> 0.2" | ||
# Slack integration | # Slack integration | ||
gem "slack-notifier", "~> 0.3.2" | gem "slack-notifier", "~> 1.0.0" | ||
# d3 | # d3 | ||
gem "d3_rails", "~> 3.1.4" | gem "d3_rails", "~> 3.1.4" | ||
... | @@ -186,6 +186,7 @@ gem "gon", '~> 5.0.0' | ... | @@ -186,6 +186,7 @@ gem "gon", '~> 5.0.0' |
gem 'nprogress-rails' | gem 'nprogress-rails' | ||
gem 'request_store' | gem 'request_store' | ||
gem "virtus" | gem "virtus" | ||
gem 'addressable' | |||
group :development do | group :development do | ||
gem "annotate", "~> 2.6.0.beta2" | gem "annotate", "~> 2.6.0.beta2" | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
app/helpers/emails_helper.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
app/helpers/git_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.
app/models/identity.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.
doc/api/services.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.
doc/hooks/custom_hooks.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/sidekiq_debugging.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/update/7.4-to-7.5.md
0 → 100644
This diff is collapsed.
doc/update/7.5-to-7.6.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
docker/Dockerfile
0 → 100644
This diff is collapsed.
docker/README.md
0 → 100644
This diff is collapsed.
docker/gitlab.rb
0 → 100644
This diff is collapsed.
docker/troubleshooting.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.
lib/api/group_members.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.
lib/gitlab/git.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.
lib/gitlab/sidekiq_logger.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/utils.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.
Please register or sign in to comment