Merge remote-tracking branch 'upstream/master' into pipeline-notifications
* upstream/master: (74 commits) Fetch locals to avoid undefined method/local error Remove author according to the document Simplify implementation of entity serializers Add documentation for the "Only allow merge requests to be merged if all discussions are resolved" feature Complete and improve specs Add setting to only allow merge requests to be merged when all discussions are resolved Apply `*_params_ce + *_params_ee` pattern to MergeRequestsController Add tests for deployment and environment entitites Add tests for serialization entities, add user entity Only skip group when it's actually a group in the "Share with group" select Fix: Todos Filter Shows All Users Fix: Guest sees some repository details and gets 404 Move shared params to a helper GrapeDSL for project hooks Update commits.scss updated styling commit SHA on branches page + added to changelog change build list height to show 6,5 builds + improve padding of list, with first/last child selectors Refine build entity tests a little Expose commit author if author exists Ignore builds directory from eslint ...
Showing
... | @@ -100,11 +100,11 @@ gem 'seed-fu', '~> 2.3.5' | ... | @@ -100,11 +100,11 @@ gem 'seed-fu', '~> 2.3.5' |
# Markdown and HTML processing | # Markdown and HTML processing | ||
gem 'html-pipeline', '~> 1.11.0' | gem 'html-pipeline', '~> 1.11.0' | ||
gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie' | gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie' | ||
gem 'gitlab-markup', '~> 1.5.0' | gem 'gitlab-markup', '~> 1.5.0' | ||
gem 'redcarpet', '~> 3.3.3' | gem 'redcarpet', '~> 3.3.3' | ||
gem 'RedCloth', '~> 4.3.2' | gem 'RedCloth', '~> 4.3.2' | ||
gem 'rdoc', '~>3.6' | gem 'rdoc', '~> 4.2' | ||
gem 'org-ruby', '~> 0.9.12' | gem 'org-ruby', '~> 0.9.12' | ||
gem 'creole', '~> 0.5.0' | gem 'creole', '~> 0.5.0' | ||
gem 'wikicloth', '0.8.1' | gem 'wikicloth', '0.8.1' | ||
... | @@ -260,9 +260,6 @@ group :development do | ... | @@ -260,9 +260,6 @@ group :development do |
gem 'better_errors', '~> 1.0.1' | gem 'better_errors', '~> 1.0.1' | ||
gem 'binding_of_caller', '~> 0.7.2' | gem 'binding_of_caller', '~> 0.7.2' | ||
# Docs generator | |||
gem 'sdoc', '~> 0.3.20' | |||
# thin instead webrick | # thin instead webrick | ||
gem 'thin', '~> 1.7.0' | gem 'thin', '~> 1.7.0' | ||
end | end | ||
... | ... |
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.
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.