delta/gitlab/gitlab-ce.git/spec/features/merge_requests, branch fix/encoding-binary-issue

Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'

2017-06-05T23:40:53+00:00

backports changed import logic from pull mirroring feature into CE

See merge request !11850

backports changed import logic from pull mirroring feature into CE

2017-06-05T22:09:10+00:00

Merge branch '31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening' into 'master'

2017-06-05T13:58:54+00:00

Increase diff limits to 100 KB for collapse and 200 KB overall

Closes #31983

See merge request !11875

Increase diff limits to 100 KB for collapse and 200 KB overall

2017-06-02T18:37:09+00:00

This is controlled with the feature flag gitlab_git_diff_size_limit_increase.
Both of these limits were basically picked arbitrarily in the first place;
disabling the feature flag reverts to the old limits.

Fix replying to a commit discussion displayed in the context of an MR

2017-06-01T14:52:11+00:00

Merge remote-tracking branch 'upstream/master' into rename-builds-controller

2017-05-31T10:14:11+00:00

* upstream/master: (116 commits)
  Revert "Merge branch 'grpc-1.3.4' into 'master'"
  Return nil when looking up config for unknown LDAP provider
  Avoid crash when trying to parse string with invalid UTF-8 sequence
  Enable Gitaly by default in GitLab 9.3
  Don’t create comment on JIRA if link already exists
  Disable sub_group_issuables_spec.rb for mysql
  Fix math rendering on blob pages
  Add changelog
  Don't allow to pass a user to ProjectWiki#http_url_to_repo
  Revert "Merge branch '1937-https-clone-url-username' into 'master'
"
  Fix bottom padding for build page
  Fix /unsubscribe slash command creating extra todos
  Fix omniauth-google-oauth2 dependencies in Gemfile.lock
  Update looks job log
  'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled
  Fix spec for Members::AuthorizedDestroyService
  31616-add-uptime-of-gitlab-instance-in-admin-area
  Set head pipeline when creating merge requests
  Create a separate helper to check if we show particular tab on a search page
  Add performance deltas between app deployments on Merge Request widget
  ...

Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master'

2017-05-26T19:42:02+00:00

Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form

Closes #32447 and #32907

See merge request !11558

Merge remote-tracking branch 'upstream/master' into rename-builds-controller

2017-05-26T10:25:32+00:00

* upstream/master: (307 commits)
  Address feedback
  Add small update for the i18n guide.
  update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error
  update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin
  name all webpack chunks to improve long term cacheability
  add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin
  upgrade to latest webpack version
  Only use DROP INDEX CONCURRENTLY on postgreql 9.2+
  Provide default for calculating label text color (!11681)
  Add failing test for #32728
  Bugfix: Always use the default language when generating emails.
  Remove unecessary commit pattern check
  Add regexp_for_value helper method
  Remove shared example and improve sub_group_issuables_spec.rb
  Remove 'should' from scenario in has_subgroup_title_spec.rb
  Cartfile git and binary methods cannot take a GitHub repo
  Fix terminals support for Kubernetes service
  Add review comments to compare_spec.rb
  Fix transient error clicking dropdown items in compare_spec.rb
  Use non-global jQuery reference within raven bundle
  ...

Update MWPS feature spec per change to remove source branch default.

2017-05-25T18:43:53+00:00

Set up merge request from fork more simply.

2017-05-24T21:39:36+00:00