Merge CE master into EE master
Conflicts: Gemfile VERSION app/assets/javascripts/project.js.coffee app/assets/javascripts/users_select.js.coffee app/controllers/projects/services_controller.rb app/models/project.rb app/views/groups/edit.html.haml features/project/service.feature features/steps/project/services.rb spec/models/concerns/mentionable_spec.rb
Showing
... | @@ -37,7 +37,7 @@ gem "gitlab_git", '7.0.0.rc10' | ... | @@ -37,7 +37,7 @@ gem "gitlab_git", '7.0.0.rc10' |
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" | ||
gem 'net-ldap' | gem 'net-ldap' | ||
# Git Wiki | # Git Wiki | ||
... | @@ -145,7 +145,7 @@ gem "gitlab-flowdock-git-hook", "~> 0.4.2" | ... | @@ -145,7 +145,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" | ||
... | ... |
app/helpers/emails_helper.rb
0 → 100644
doc/api/services.md
0 → 100644
doc/hooks/custom_hooks.md
0 → 100644
16.9 KB
lib/gitlab/git.rb
0 → 100644
lib/gitlab/sidekiq_logger.rb
0 → 100644
lib/gitlab/utils.rb
0 → 100644