Commits · 8f4b6e2ef1fbd84f6c7e141cc911acfbc9ed568d · nexedi / gitlab-ce

03 Feb, 2018 3 commits

Merge branch 'sh-fix-schema-closed-at' into 'master' · 8f4b6e2e

Yorick Peterse authored Feb 03, 2018

issues.closed_at should be datetime_with_timezone

Closes gitlab-qa#176

See merge request gitlab-org/gitlab-ee!4370

8f4b6e2e

issues.closed_at should be datetime_with_timezone · 7c358449
Stan Hu authored Feb 03, 2018
```
CE has this type right, but somehow EE lost this change.

Closes gitlab-org/gitlab-qa#176
```
7c358449

Merge branch 'sh-fix-geo-spec-namespace' into 'master' · 83807c1f

Stan Hu authored Feb 03, 2018

Fix JobArtifactUploader namespacing issues

Closes #4801

See merge request gitlab-org/gitlab-ee!4368

83807c1f

02 Feb, 2018 32 commits
- Fix JobArtifactUploader namespacing issues · c35f4261
  Stan Hu authored Feb 02, 2018
```
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/4801
```
  c35f4261
- Merge branch 'ee-refactor-ci-variable-list-for-future-usage-in-4110' into 'master' · 3ea5015f
  Filipa Lacerda authored Feb 02, 2018
```
Refactor CI variable list code for usage with CI/CD settings page secret variables -- EE merge edition

See merge request gitlab-org/gitlab-ee!4274
```
  3ea5015f
- Merge branch 'webpack-auto-config-ee' into 'master' · 13c5bab5
  Jacob Schatz authored Feb 02, 2018
```
Port of 'webpack-auto-config' to EE

See merge request gitlab-org/gitlab-ee!4364
```
  13c5bab5
- Merge branch '4163-move-uploads-to-object-storage-vsizov' into 'master' · b21cb76e
  Nick Thomas authored Feb 02, 2018
```
[Geo] Skip attachments that is stored in the object storage

Closes #4626

See merge request gitlab-org/gitlab-ee!4346
```
  b21cb76e
- Add a changelog item · 5943628f
  Valery Sizov authored Feb 02, 2018
  
  5943628f
- migrate groups:show to static bundle · 1030f55f
  Mike Greiling authored Feb 02, 2018
  
  1030f55f
- Merge branch 'ee-37698-current-settings' into 'master' · ea10dec6
  Sean McGivern authored Feb 02, 2018
```
use Gitlab::UserSettings directly as a singleton instead of including/extending it

See merge request gitlab-org/gitlab-ee!4337
```
  ea10dec6
- use Gitlab::UserSettings directly as a singleton instead of including/extending it · 3c793920
  Mario de la Ossa authored Feb 02, 2018
  
  3c793920
- Merge branch 'ce-to-ee-2018-02-02' into 'master' · f32b4108
  Stan Hu authored Feb 02, 2018
```
CE upstream - 2018-02-02 12:59 UTC

Closes gitaly#970 and gitlab-ce#41595

See merge request gitlab-org/gitlab-ee!4360
```
  f32b4108
- Merge branch 'rd-3225-member-lock-works-with-ee-9-5-without-license' into 'master' · 923cad0e
  Sean McGivern authored Feb 02, 2018
```
Don't show Member Lock setting for unlicensed system

Closes #3225

See merge request gitlab-org/gitlab-ee!4355
```
  923cad0e
- Merge branch 'ee-40793-fix-mr-title-for-jira' into 'master' · 12bdc1d7
  Sean McGivern authored Feb 02, 2018
```
Prevent JIRA issue identifier from being humanized

See merge request gitlab-org/gitlab-ee!4362
```
  12bdc1d7
- port of 'webpack-auto-config' to EE · 730c41bb
  Mike Greiling authored Feb 02, 2018
  
  730c41bb
- Don't show Member Lock setting for unlicensed system · 4f1a16ac
  Rubén Dávila authored Feb 02, 2018
  
  4f1a16ac
- Prevent JIRA issue identifier from being humanized · 04adddea
  Sean McGivern authored Feb 02, 2018
```
EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16491
```
  04adddea
- fixed missing tooltip directive · 1f5d8e01
  Phil Hughes authored Feb 02, 2018
  
  1f5d8e01
- fixed approvals MR widget component · 9ef0f7eb
  Phil Hughes authored Feb 02, 2018
  
  9ef0f7eb
- Merge branch '4163-move-uploads-to-object-storage' into 'master' · 32c801eb
  Sean McGivern authored Feb 02, 2018
```
Move uploads to object storage

Closes #4163

See merge request gitlab-org/gitlab-ee!3867
```
  32c801eb
- Resolve conflict in schema.rb · ffc63066
  Brett Walker authored Feb 02, 2018
  
  ffc63066
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-02 · 1b309608
  GitLab Bot authored Feb 02, 2018
```
# Conflicts:
#	db/schema.rb

[ci skip]
```
  1b309608
- Merge branch 'ce-to-ee-2018-02-01' into 'master' · b11b6d3e
  Marin Jankovski authored Feb 02, 2018
```
CE upstream - 2018-02-01 18:25 UTC

See merge request gitlab-org/gitlab-ee!4352
```
  b11b6d3e
- Merge branch 'sh-fix-streaming-health-check' into 'master' · f8e1e57f
  Nick Thomas authored Feb 02, 2018
```
Fix Geo streaming check

Closes #4765

See merge request gitlab-org/gitlab-ee!4340
```
  f8e1e57f
- Merge branch '42223-squashing-mrs-takes-too-long' into 'master' · c63af942
  Sean McGivern authored Feb 02, 2018
```
Fix an issue where sparse checkout wasn't configured correctly

See merge request gitlab-org/gitlab-ce!16864
```
  c63af942
- Merge branch 'ce-to-ee-2018-02-01' of https://gitlab.com/gitlab-org/gitlab-ee... · c67460f2
  Constance Okoghenun authored Feb 02, 2018
```
Merge branch 'ce-to-ee-2018-02-01' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee-2018-02-01
```
  c67460f2
- Resolved conflicts in app/assets/javascripts/pages/projects/tree/show/index.js · d65cd8cc
  Constance Okoghenun authored Feb 02, 2018
  
  d65cd8cc
- Resolve conflict in scripts/lint-rugged · 94d4b626
  Marin Jankovski authored Feb 02, 2018
  
  94d4b626
- Merge branch 'fl-mr-widget-1' into 'master' · 8891fbd0
  Phil Hughes authored Feb 02, 2018
```
Moves more mr widget components into vue files

See merge request gitlab-org/gitlab-ce!16857
```
  8891fbd0
- Merge branch 'fl-mr-widget-2' into 'master' · 756e1969
  Phil Hughes authored Feb 02, 2018
```
Moves author components into vue files

See merge request gitlab-org/gitlab-ce!16863
```
  756e1969
- Merge branch 'patch-28' into 'master' · a74c73d1
  Dmitriy Zaporozhets authored Feb 02, 2018
```
Fix typo in gitlab_runner_chart.md

See merge request gitlab-org/gitlab-ce!16860
```
  a74c73d1
- Merge branch 'tz-ide-visual-polish-2601' into 'master' · 7d266369
  Phil Hughes authored Feb 02, 2018
```
Web IDE Visual Polish 26.01

See merge request gitlab-org/gitlab-ee!4279
```
  7d266369
- Web IDE Visual Polish 26.01 · 9bde4e6c
  Tim Zallmann authored Feb 02, 2018
  
  9bde4e6c
- Merge branch 'issues-closed-at-steal' into 'master' · 81181fa0
  Sean McGivern authored Feb 02, 2018
```
Finish any remaining jobs for issues.closed_at

Closes #41595

See merge request gitlab-org/gitlab-ce!16858
```
  81181fa0
- Merge branch 'fix/improve-issue-note-dropdown' into 'master' · 6f40aaac
  Phil Hughes authored Feb 02, 2018
```
Improve issue note dropdown and mr button

See merge request gitlab-org/gitlab-ce!16758
```
  6f40aaac
01 Feb, 2018 5 commits

Merge branch 'qa-173' into 'master' · f016c780

Grzegorz Bizon authored Feb 01, 2018

QA::Page::Component::Dropzone#initialize needs a QA::Page::Base object

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

f016c780

Merge branch 'qa-absolute-path-to-screenshots' into 'master' · cacbbe34
Grzegorz Bizon authored Feb 01, 2018
```
Ensure we save QA screenshots to an absolute path

See merge request gitlab-org/gitlab-ce!16845
```
cacbbe34

Merge branch 'qa-173-ee' into 'master' · 9a6cac5e

Grzegorz Bizon authored Feb 01, 2018

[EE] QA::Page::Component::Dropzone#initialize needs a QA::Page::Base object

Closes gitlab-qa#173

See merge request gitlab-org/gitlab-ee!4344

9a6cac5e

Merge branch 'backport-ee-4644-geo-selective-sync-by-shard' into 'master' · 71848f70
Robert Speicher authored Feb 01, 2018
```
Backport changes in the application settings helper to CE

See merge request gitlab-org/gitlab-ce!16801
```
71848f70
Merge branch '4644-geo-selective-sync-by-shard' into 'master' · f1b444d3
Robert Speicher authored Feb 01, 2018
```
Resolve "Geo selective sync by repository shard"

Closes #4644

See merge request gitlab-org/gitlab-ee!4286
```
f1b444d3