Merge branch 'master' into new-sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/snippets_controller.rb
Showing
... | ... | @@ -42,7 +42,7 @@ gem "browser" |
gem "gitlab_git", '~> 7.1.10' | ||
# Ruby/Rack Git Smart-HTTP Server Handler | ||
gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack' | ||
gem 'gitlab-grack', '~> 2.0.2', require: 'grack' | ||
# LDAP Auth | ||
gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap" | ||
... | ... | @@ -88,7 +88,7 @@ gem "six" |
gem "seed-fu" | ||
# Markup pipeline for GitLab | ||
gem 'html-pipeline-gitlab', '~> 0.1' | ||
gem 'html-pipeline', '~> 1.11.0' | ||
# Markdown to HTML | ||
gem "github-markup" | ||
... | ... | @@ -143,7 +143,7 @@ gem "redis-rails" |
gem 'tinder', '~> 1.9.2' | ||
# HipChat integration | ||
gem "hipchat", "~> 1.4.0" | ||
gem 'hipchat', '~> 1.5.0' | ||
# Flowdock integration | ||
gem "gitlab-flowdock-git-hook", "~> 0.4.2" | ||
... | ... | @@ -251,7 +251,8 @@ group :development, :test do |
# PhantomJS driver for Capybara | ||
gem 'poltergeist', '~> 1.5.1' | ||
gem 'jasmine', '2.0.2' | ||
gem 'jasmine', '~> 2.2.0' | ||
gem 'jasmine-rails' | ||
gem "spring", '~> 1.3.1' | ||
gem "spring-commands-rspec", '1.0.4' | ||
... | ... |
doc/update/7.9-to-7.10.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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment