delta/gitlab/gitlab-ce.git/spec/models/ci, branch multi-line-inline-diff

Rename according to:

2016-06-20T08:52:05+00:00

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12563922

For clarification and consistency

Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project

2016-06-17T11:52:55+00:00

* upstream/master: (337 commits)
  Update CHANGELOG for !4659
  Center the header logo for all Devise emails
  Add previews for all customized Devise emails
  Customize the Devise `unlock_instructions` email
  Customize the Devise `reset_password_instructions` email
  Customize the Devise `password_change` emails
  Use gitlab-git 10.2.0
  Use Git cached counters on project show page
  Fix indentation scss-lint errors
  Added title attribute to enties in tree view Closes #18353
  Banzai::Filter::ExternalLinkFilter use XPath
  Reduce queries in IssueReferenceFilter
  Use gitlab_git 10.1.4
  Fixed ordering in Project.find_with_namespace
  Fix images in emails
  Banzai::Filter::UploadLinkFilter use XPath
  Turn Group#owners into a has_many association
  Make project_id nullable
  CHANGELOG [ci skip]
  CHANGELOG [ci skip]
  ...

Use active tense, feedback from:

2016-06-16T15:33:53+00:00

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12501303

blank line between setup and expectation, feedback:

2016-06-16T15:26:49+00:00

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093/diffs#note_12501266
and:
https://robots.thoughtbot.com/four-phase-test

Remove reduntant method for building pipeline builds

2016-06-15T12:12:25+00:00

Adopt the rename from ci_commits to ci_pipelines

2016-06-15T09:34:44+00:00

Return false in create_builds if not builds created

2016-06-15T07:35:11+00:00

This fixes compatibility with trigger request create service.

Remove ci commit specs that remain after bad merge

2016-06-14T12:22:46+00:00

Merge branch 'master' into fix/status-of-pipeline-without-builds

2016-06-14T11:44:03+00:00

* master: (538 commits)
  Fix broken URI joining for `teamcity_url` with suffixes
  Factorize duplicated code into a method in BambooService and update specs
  Fix broken URI joining for `bamboo_url` with suffixes
  Honor credentials on calling Bamboo CI trigger
  Update CHANGELOG
  Use Issue.visible_to_user in Notes.search to avoid query duplication
  Project members with guest role can't access confidential issues
  Allow users to create confidential issues in private projects
  Update CHANGELOG
  Remove deprecated issues_tracker and issues_tracker_id from project
  Schema doesn’t reflect the changes of the last 3 migrations
  Apply reviewer notes: update CHANGELOG, adjust code formatting
  Move issue rendering tests into separate contexts
  Move change description to proper release and fix typo
  Add more information into RSS fead for issues
  Revert CHANGELOG
  Also rename "find" in the specs
  Change to new Notes styleguide
  Add guide on changing a document's location
  Change logs.md location in README
  ...

Conflicts:
	app/services/ci/create_builds_service.rb
	app/services/ci/create_pipeline_service.rb
	app/services/create_commit_builds_service.rb
	spec/models/ci/commit_spec.rb
	spec/services/ci/create_builds_service_spec.rb
	spec/services/create_commit_builds_service_spec.rb

Rename specific_for to available_for:

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

Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12413950