delta/gitlab/gitlab-ce.git/spec/services/merge_requests, branch diff-notes-refactor

Backport changes from EE squash

2017-02-03T09:46:03+00:00

Backport changes from the EE-only squash implementation, which would
otherwise conflict when merge CE into EE.

Merge branch 'fix-git-hooks-when-creating-file' into 'master'

2017-02-02T23:26:35+00:00


Don't execute git hooks if you create branch as part of other change

Closes #23439

See merge request !7237

Active tense test coverage

2017-02-01T22:45:41+00:00

Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/642 back into CE

Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file

2017-01-26T09:21:38+00:00

* upstream/master: (1122 commits)
  Update CHANGELOG.md for 8.16.2
  Display project ID in project settings (!8572)
  fixed points from comments to improve code quality
  Update CHANGELOG.md for 8.14.8
  Statisfy eslint
  Add CHANGELOG entry
  Fix access to the wiki code via HTTP when repository feature disabled
  Display fullscreen button on small screens (!5302)
  Prevent removing fields from dropdowns on input elements
  fix for all themes
  Return struct instead of multiple values
  Fix race conditions for AuthorizedProjectsWorker
  Add User#nested_groups and User#nested_projects methods
  Fix spec failure due to timestamp ordering issue in mySQL
  Fixed error with filter keyboard tests
  `can?` already includes the `feature_available?` check
  Test there is no Merge Request button when MRs are disabled
  Ensure the correct Merge Request button is found
  Add 409 conflict tests
  Add CHANGELOG
  ...

Backport EE changes on approvals reset for closed MRs

2017-01-23T14:45:53+00:00

Mark MR as WIP when pushing WIP commits

2017-01-19T11:30:34+00:00

Address MR comments

2017-01-13T14:16:35+00:00

support `/merge` slash comand for MRs

2017-01-11T13:48:07+00:00

Merge branch 'master' into fix-git-hooks-when-creating-file

2017-01-04T14:25:55+00:00

* master: (1031 commits)
  Add changelog entry for renaming API param [ci skip]
  Add missing milestone parameter
  Refactor issues filter in API
  Fix project hooks params
  Gitlab::LDAP::Person uses LDAP attributes configuration
  Don't delete files from spec/fixtures
  Copy, don't move uploaded avatar files
  Minor improvements to changelog docs
  Rename logo, apply for Slack too
  Fix Gemfile.lock for the octokit update
  Fix cross-project references copy to include the project reference
  Add logo in public files
  Use stable icon for Mattermost integration
  rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?)
  API: extern_uid is a string
  Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu
  Removed bottom padding from merge manually from CLI because of repositioning award emoji's
  Make haml_lint happy
  Improve spec
  Add feature tests for Cycle Analytics
  ...

Merge branch 'issue_22664' into 'master'

2016-12-29T10:00:45+00:00


Check if user can read project before being assigned to issue

Closes #22664

See merge request !7980