delta/gitlab/gitlab-ce.git/lib/banzai, branch patch-14

Merge branch '20890-comment-image-inline' into 'master'

2017-02-27T19:23:05+00:00


Fix inline comment images by removing wrapper #20890

Closes #20890

See merge request !5804

Revert "Enable Style/DotPosition"

2017-02-23T15:33:19+00:00

This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.

# Conflicts:
#	.rubocop.yml
#	.rubocop_todo.yml
#	lib/gitlab/ci/config/entry/global.rb
#	lib/gitlab/ci/config/entry/jobs.rb
#	spec/lib/gitlab/ci/config/entry/factory_spec.rb
#	spec/lib/gitlab/ci/config/entry/global_spec.rb
#	spec/lib/gitlab/ci/config/entry/job_spec.rb
#	spec/lib/gitlab/ci/status/build/factory_spec.rb
#	spec/lib/gitlab/incoming_email_spec.rb

Revert "Prefer leading style for Style/DotPosition"

2017-02-23T15:33:05+00:00

This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.

Revert "Enable Style/BarePercentLiterals"

2017-02-23T15:32:42+00:00

This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.

Prefer leading style for Style/DotPosition

2017-02-23T15:32:22+00:00

Fix code for cops

2017-02-23T15:31:57+00:00

Enable Style/ConditionalAssignment

2017-02-23T15:31:57+00:00

Enable Style/BarePercentLiterals

2017-02-23T15:31:57+00:00

Enable Style/MutableConstant

2017-02-23T15:31:56+00:00

Enable Style/DotPosition

2017-02-23T15:31:56+00:00