Merge branch 'master' into reference_relative_links
Conflicts: spec/models/project_spec.rb
Showing
... | ... | @@ -14,7 +14,6 @@ gem "protected_attributes" |
gem 'rails-observers' | ||
gem 'actionpack-page_caching' | ||
gem 'actionpack-action_caching' | ||
gem 'activerecord-deprecated_finders' | ||
# Supported DBs | ||
gem "mysql2", group: :mysql | ||
... | ... |
app/models/merge_request_diff.rb
0 → 100644
66.3 KB
此差异已折叠。