delta/gitlab/gitlab-ce.git, branch rename-ci-commit-phase-2

Fix remaining test offenses

2016-06-07T11:14:37+00:00

Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2

2016-06-07T08:26:27+00:00

Fix tests failures

2016-06-07T08:25:57+00:00

Merge branch 'license-finder-gem' into 'master'

2016-06-07T08:06:17+00:00


License finder gem

Every time a gem is added to the Gemfile, or a gem is updated with a new dependency or change of license, LicenseFinder will check to ensure that the license in use has been whitelisted for use in the project. GPLv2 and GPLv3 libraries are not allowed to be linked-to from non-GPL projects (e.g. the MIT-licensed GitLab CE or proprietary EE), otherwise we're violating the license.

https://github.com/pivotal/LicenseFinder

See also: gitlab-com/operations#164

See merge request !3775

Merge branch 'colorize-db-seed' into 'master'

2016-06-07T06:47:56+00:00


Fix missed colorize methods.

Fix #18250.

cc: @twk3 

See merge request !4495

Merge branch 'bump-rouge' into 'master'

2016-06-07T03:59:45+00:00


Bump rouge to 1.11.0

See: https://github.com/jneen/rouge/blob/master/CHANGELOG.md

See merge request !4491

Bump rouge to 1.11.0

2016-06-07T03:55:37+00:00

Merge branch '18254-use-better_errors-editor-links-in-sherlock' into 'master'

2016-06-07T02:02:23+00:00


Use better_errors editor links in sherlock

Closes #18254. Uses the same editor configuration of `better_errors`
so that you don't have to configure things twice. Remember to have a
custom initializer that specifies your editor.

Example for atom. File `config/initializers/better_errors.rb`:
````ruby
if defined?(BetterErrors)
  BetterErrors.editor = "atm://open?url=file://%{file}&line=%{line}"
end
````

See merge request !4497

Use better_errors editor links in sherlock

2016-06-06T22:27:26+00:00

Remember to configure your `better_errors` editor to point to your program of preference

Fix missed colorize methods.

2016-06-06T21:32:36+00:00