Merge remote-tracking branch 'origin/master' into ci-permissions
# Conflicts: # app/views/projects/builds/index.html.haml
Showing
... | ... | @@ -30,14 +30,15 @@ gem 'omniauth-github', '~> 1.1.1' |
gem 'omniauth-gitlab', '~> 1.0.0' | ||
gem 'omniauth-google-oauth2', '~> 0.2.0' | ||
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos | ||
gem 'omniauth-saml', '~> 1.4.0' | ||
gem 'omniauth-saml', '~> 1.4.2' | ||
gem 'omniauth-shibboleth', '~> 1.2.0' | ||
gem 'omniauth-twitter', '~> 1.2.0' | ||
gem 'omniauth_crowd', '~> 2.2.0' | ||
gem 'rack-oauth2', '~> 1.2.1' | ||
# reCAPTCHA protection | ||
# Spam and anti-bot protection | ||
gem 'recaptcha', require: 'recaptcha/rails' | ||
gem 'akismet', '~> 2.0' | ||
# Two-factor authentication | ||
gem 'devise-two-factor', '~> 2.0.0' | ||
... | ... | @@ -49,7 +50,7 @@ gem "browser", '~> 1.0.0' |
# Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | ||
gem "gitlab_git", '~> 7.2.23' | ||
gem "gitlab_git", '~> 8.0.0' | ||
# LDAP Auth | ||
# GitLab fork with several improvements to original library. For full list of changes | ||
... | ... | @@ -302,9 +303,6 @@ group :production do |
gem "gitlab_meta", '7.0' | ||
end | ||
gem "newrelic_rpm", '~> 3.9.4.245' | ||
gem 'newrelic-grape' | ||
gem 'octokit', '~> 3.8.0' | ||
gem "mail_room", "~> 0.6.1" | ||
... | ... |
app/models/spam_log.rb
0 → 100644
app/models/spam_report.rb
0 → 100644
config/newrelic.yml
deleted
100644 → 0
doc/integration/akismet.md
0 → 100644
54.5 KB
![doc/integration/img/oauth_provider_admin_application.png](https://lab.nexedi.cn/nexedi/gitlab-ce/-/raw/d231b6b9182ce9f68f267af0a073136c898f6892/doc/integration/img/oauth_provider_admin_application.png)
![doc/integration/img/oauth_provider_application_form.png](https://lab.nexedi.cn/nexedi/gitlab-ce/-/raw/d231b6b9182ce9f68f267af0a073136c898f6892/doc/integration/img/oauth_provider_application_form.png)
33.1 KB
![doc/integration/img/oauth_provider_authorized_application.png](https://lab.nexedi.cn/nexedi/gitlab-ce/-/raw/d231b6b9182ce9f68f267af0a073136c898f6892/doc/integration/img/oauth_provider_authorized_application.png)
![doc/integration/img/oauth_provider_user_wide_applications.png](https://lab.nexedi.cn/nexedi/gitlab-ce/-/raw/d231b6b9182ce9f68f267af0a073136c898f6892/doc/integration/img/oauth_provider_user_wide_applications.png)
lib/gitlab/akismet_helper.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/workhorse.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/factories/spam_logs.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.
spec/models/spam_log_spec.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.