delta/gitlab/gitlab-ce.git/spec/models/environment_spec.rb, branch dm-consistent-commit-widget

Keep presentation logic in one place and remove unecessary arguments.

2017-05-11T21:07:12+00:00

+ fix tests

Enable the Style/TrailingCommaInLiteral cop

2017-05-10T16:25:45+00:00

Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable

Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions

2017-04-13T13:08:52+00:00

* master: (641 commits)
  Revert "Fix registry for projects with uppercases in path"
  Fix registry for projects with uppercases in path
  Move event icons into events_helper
  Reset New branch button when issue state changes
  Add link to environments on kubernetes.md
  Indent system notes on desktop screens
  Improve webpack-dev-server compatibility with non-localhost setups.
  Add changelog entry
  Fix recent searches icon alignment in Safari
  Use preload to avoid Rails using JOIN
  Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error
  Prepare for zero downtime migrations
  Fix filtered search input width for IE
  Fix the `gitlab:gitlab_shell:check` task
  Fixed random failures with Poll spec
  Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates
  Let uses hide verbose output by default
  Separate examples for each other
  Collapse similar sibling scenarios
  Use empty_project for resources that are independent of the repo
  ...

Conflicts:
	app/views/projects/ci/builds/_build.html.haml

Use build policy to determine if user can play build

2017-04-12T11:48:43+00:00

Setup and run a Gitaly server for testing if GitalyClient is enabled

2017-04-11T19:00:44+00:00

Take branch access into account when stopping environment

2017-04-06T15:15:15+00:00

Fix specs related to new manual actions permissions

2017-04-06T15:15:15+00:00

Hopefully this works

2017-04-06T10:10:03+00:00

Cleanup

2017-04-06T09:54:24+00:00

rubocop

2017-04-06T09:53:56+00:00