delta/gitlab/gitlab-ce.git/lib, branch use-queue_namespace

Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'

2017-12-18T13:08:51+00:00

Add button to run scheduled pipeline immediately

Closes #38741

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

Merge branch 'no-ivar-in-modules' into 'master'

2017-12-15T19:56:15+00:00

Add cop to make sure we don't use ivar in a module

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

Merge branch 'dm-ldap-email-readonly' into 'master'

2017-12-15T12:46:22+00:00

Make sure user email is read only when synced with LDAP

Closes #41033

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

Make sure user email is read only when synced with LDAP

2017-12-15T11:48:48+00:00

Backport changes from EE

2017-12-15T11:37:57+00:00

Merge branch 'gitaly-conflicts-prep' into 'master'

2017-12-15T10:59:21+00:00

Simplify conflict resolver interface

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

Merge branch '41016-import-gitlab-shell-projects' into 'master'

2017-12-15T09:54:42+00:00

Import gitlab-shell gitlab_projects.rb as at v5.10.2

Closes #41016

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

Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules

2017-12-15T09:14:26+00:00

* upstream/master: (671 commits)
  Make rubocop happy
  Use guard clause
  Improve language
  Prettify
  Use temp branch
  Pass info about who started the job and which job triggered it
  Docs: add indexes for monitoring and performance monitoring
  clearer-documentation-on-inline-diffs
  Add docs for commit diff discussion in merge requests
  sorting for tags api
  Clear BatchLoader after each spec to prevent holding onto records longer than necessary
  Include project in BatchLoader key to prevent returning blobs for the wrong project
  moved lfs_blob_ids method into ExtractsPath module
  Converted JS modules into exported modules
  spec fixes
  Bump gitlab-shell version to 5.10.3
  Clear caches before updating MR diffs
  Use new Ruby version 2.4 in GitLab QA images
  moved lfs blob fetch from extractspath file
  Update GitLab QA dependencies
  ...

Merge branch 'lfs-badge' into 'master'

2017-12-15T09:02:24+00:00

Added LFS badge to indicate LFS tracked files

Closes #15567

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

Simplify conflict resolver interface

2017-12-14T19:02:50+00:00

This does two things:
- Pass commit oids instead of `Gitlab::Git::Commit`s. We only need the
former.
- Depend on only the target repository for conflict listing. For
conflict resolution, treat one repository as a remote one so that we can
implement it as such in Gitaly.