Merge branch 'master' into update_api_messages
Conflicts:
CHANGELOG
Showing
... | ... | @@ -37,7 +37,7 @@ gem "browser" |
# Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | ||
gem "gitlab_git", '7.0.0.rc12' | ||
gem "gitlab_git", '7.0.0.rc13' | ||
# Ruby/Rack Git Smart-HTTP Server Handler | ||
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | ||
... | ... | @@ -95,7 +95,7 @@ gem "github-markup" |
gem 'redcarpet', '~> 3.1.2' | ||
gem 'RedCloth' | ||
gem 'rdoc', '~>3.6' | ||
gem 'org-ruby', '= 0.9.9' | ||
gem 'org-ruby', '= 0.9.12' | ||
gem 'creole', '~>0.3.6' | ||
gem 'wikicloth', '=0.8.1' | ||
gem 'asciidoctor', '= 0.1.4' | ||
... | ... |
app/helpers/milestones_helper.rb
0 → 100644
app/views/groups/_filter.html.haml
deleted
100644 → 0
doc/operations/cleaning_up_redis_sessions.md
0 → 100644
Please
register
or
sign in
to comment