delta/gitlab/gitlab-ce.git/features/steps, branch git-write-ref-prep

Merge branch 'mb-invites-feature-to-rspec' into 'master'

2018-01-08T09:44:20+00:00

Move invites spinach test to Rspec

See merge request gitlab-org/gitlab-ce!16126

Merge branch 'mv-explore-groups-spinach-to-rspec' into 'master'

2018-01-08T09:37:43+00:00

Move explore groups spinach test to RSpec

See merge request gitlab-org/gitlab-ce!16129

Merge branch '22643-manual-job-page' into 'master'

2018-01-06T14:40:45+00:00

Resolve "Improve non-triggered manual action job detail page"

Closes #22643 and #37843

See merge request gitlab-org/gitlab-ce!15991

Backport 'Rebase' feature from EE to CE

2018-01-05T08:34:59+00:00

When a project uses fast-forward merging strategy user has
to rebase MRs to target branch before it can be merged.
Now user can do rebase in UI by clicking 'Rebase' button
instead of doing rebase locally.

This feature was already present in EE, this is only backport
of the feature to CE. Couple of changes:
* removed rebase license check
* renamed migration (changed timestamp)

Closes #40301

Merge branch 'master' into 22643-manual-job-page

2018-01-04T22:39:01+00:00

* master: (200 commits)
  Fix issue boards scroll config.
  Added multi editor setting on the profile preferences page
  fix missing import of timeWeek which would cause errors in prometheus graphs with deployments
  Remove downcase from special path helper
  Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql}
  Fix error when viewing diffs without blobs
  Moves prettier to dev dependency
  Eager load event target authors whenever possible
  Do not run ee_compat_check on security branches
  Include integration tests in CE/EE testing documentation
  41054-Disallow creation of new Kubernetes integrations
  Resolve "Resizable file list and commit panel"
  Make tooltip placement bottom by default as per design guidelines
  Fix groups list icon, timestamp alignment and row height
  Avoid leaving a push event empty if payload cannot be created
  Move git operations for UpdateRemoteMirrorService into Gitlab::Git
  Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository
  Move push_remote_branches from Gitlab::Shell to Gitlab::Git::Repository
  Update Kubernetes service documentation
  fix issue #37843
  ...

Move explore groups spinach test to RSpec

2017-12-25T07:27:47+00:00

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

Move invites spinach test to Rspec

2017-12-25T07:27:18+00:00

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

Replace '.team << [user, role]' with 'add_role(user)' in specs

2017-12-22T08:18:28+00:00

Merge branch 'master' into 22643-manual-job-page

2017-12-22T06:47:54+00:00

* master: (68 commits)
  Last push event widget width for fixed layout
  Added 'admin' persona
  Docs: move article Artifactory + GL to subject-related folder
  Mention GitLab Pages when changing username
  Consolidate the docs when changing a repo path
  Add docs for automatic redirects when renaming namespaces
  move "Transfer an existing project into a group" to project docs
  Do not show Vue pagination if only one page
  Resolve "Decouple multi-file editor from file list"
  Update Ruby version to 2.3.6
  Skip projects filter on merge requests search
  Fall back to the `MergeRequestWidgetEntity`
  LDAP extern_uids are not normalized when updated via API
  organise content by subject
  Restore missing language code in datetime_utility.js
  Add support for defining explicit dependencies to QA factories
  Document mounting volumes with Docker-in-Docker
  add missing word to pawel-reduce_cardinality_of_prometheus_metrics.yml
  Use seconds where possible, and convert to milliseconds for Influxdb consumption
  update dispatcher to allow for dynamic imports until webpack plugin is updated
  ...

Fix broken spinach test

2017-12-21T17:26:23+00:00