Commits · 73c87651b9b739b84d818e26bb7b5bde39d28373 · nexedi / gitlab-ce

25 Oct, 2018 40 commits
- EE: Always use `attribute` to define the product · 73c87651
  Lin Jen-Shin authored Oct 25, 2018
  
  73c87651
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 2f7a084b
  🤖 GitLab Bot 🤖 authored Oct 25, 2018
```
CE upstream - 2018-10-25 19:21 UTC

See merge request gitlab-org/gitlab-ee!8090
```
  2f7a084b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · 0d2ce3ea
  GitLab Bot authored Oct 25, 2018
  
  0d2ce3ea
- Merge branch 'prettify-all-the-things-3' into 'master' · a97e599a
  Tim Zallmann authored Oct 25, 2018
```
Prettify all the things (part 3)

See merge request gitlab-org/gitlab-ce!22251
```
  a97e599a
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 81d27fd0
  🤖 GitLab Bot 🤖 authored Oct 25, 2018
```
CE upstream - 2018-10-25 17:21 UTC

See merge request gitlab-org/gitlab-ee!8089
```
  81d27fd0
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · 363a9640
  GitLab Bot authored Oct 25, 2018
  
  363a9640
- Merge branch 'ee-49565-ssh-push-mirroring' into 'master' · e3110c1a
  Robert Speicher authored Oct 25, 2018
```
EE port of "backport SSH host key detection code to CE"

See merge request gitlab-org/gitlab-ee!8065
```
  e3110c1a
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 8c85be90
  Robert Speicher authored Oct 25, 2018
```
CE upstream - 2018-10-25 15:21 UTC

See merge request gitlab-org/gitlab-ee!8086
```
  8c85be90
- Merge branch '49565-ssh-push-mirroring' into 'master' · 982276c3
  Robert Speicher authored Oct 25, 2018
```
Backport SSH host key detection code to CE

See merge request gitlab-org/gitlab-ce!22577
```
  982276c3
- Merge branch '7841-geo-deleting-a-project-leaves-orphaned-lfs-objects-around' into 'master' · 9dd69e8e
  Douglas Barbosa Alexandre authored Oct 25, 2018
```
Geo: Deleting a project leaves orphaned LFS objects and Job artifacts around

Closes #7841

See merge request gitlab-org/gitlab-ee!8031
```
  9dd69e8e
- Merge branch 'sh-update-parser' into 'master' · c2a8cd05
  Robert Speicher authored Oct 25, 2018
```
Upgrade parser gem to 2.5.1.2

See merge request gitlab-org/gitlab-ce!22590
```
  c2a8cd05
- Resolve merge conflicts for EE-specific changes · d5f38961
  Kushal Pandya authored Oct 25, 2018
  
  d5f38961
- Merge branch 'jej/group-saml-metadata-common-changes' into 'master' · 89571f3f
  Kamil Trzciński authored Oct 25, 2018
```
Extract SAML refactoring from metadata MR

See merge request gitlab-org/gitlab-ee!7997
```
  89571f3f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · 5a91632d
  GitLab Bot authored Oct 25, 2018
```
# Conflicts:
#	app/assets/javascripts/issuable_form.js

[ci skip]
```
  5a91632d
- Merge branch 'mj/review-apps-guard' into 'master' · 4de90041
  Robert Speicher authored Oct 25, 2018
```
Review apps cleanup schedule runs on master

See merge request gitlab-org/gitlab-ce!22601
```
  4de90041
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 653f7a91
  Filipa Lacerda authored Oct 25, 2018
```
CE upstream - 2018-10-25 12:21 UTC

See merge request gitlab-org/gitlab-ee!8083
```
  653f7a91
- Review apps cleanup schedule runs on master · 309d3ebb
  Marin Jankovski authored Oct 25, 2018
  
  309d3ebb
- Merge branch '53055-combine-date-util-functions' into 'master' · 86d8fd86
  Filipa Lacerda authored Oct 25, 2018
```
Combine all datetime library functions into `datetime_utility.js`

This MR moves datetime methods from `app/assets/javascripts/lib/utils/pretty_time.js` & `app/assets/javascripts/lib/utils/datefix.js` into `app/assets/javascripts/lib/utils/datetime_utility.js`.

Closes #53055

See merge request gitlab-org/gitlab-ce!22570
```
  86d8fd86
- Merge branch 'ee-53055-combine-date-util-functions' into 'master' · 75100705
  Filipa Lacerda authored Oct 25, 2018
```
EE Port: Combine all datetime library functions into `datetime_utility.js`

See merge request gitlab-org/gitlab-ee!8081
```
  75100705
- EE Port: Combine all datetime library functions into `datetime_utility.js` · c78607fa
  Kushal Pandya authored Oct 25, 2018
  
  c78607fa
- Merge branch 'mr-diff-data' into 'master' · 719f46e2
  Filipa Lacerda authored Oct 25, 2018
```
Impove diff discussion data

See merge request gitlab-org/gitlab-ce!22491
```
  719f46e2
- Backport SSH host key detection code to CE · 324ff195
  Nick Thomas authored Oct 24, 2018
```
This functionality is needed for SSH push mirroring support, which is a
CE feature.
```
  324ff195
- Minor code quality improvements to host key code · e5e299a8
  Nick Thomas authored Oct 25, 2018
  
  e5e299a8
- Resolve CE-to-EE conflicts for job page · 72d1817a
  Steve Azzopardi authored Oct 25, 2018
  
  72d1817a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · 105e7de5
  GitLab Bot authored Oct 25, 2018
```
# Conflicts:
#	app/assets/javascripts/jobs/components/job_app.vue
#	app/assets/javascripts/jobs/store/getters.js
#	spec/javascripts/jobs/store/getters_spec.js

[ci skip]
```
  105e7de5
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · b8275cdc
  🤖 GitLab Bot 🤖 authored Oct 25, 2018
```
CE upstream - 2018-10-25 11:21 UTC

See merge request gitlab-org/gitlab-ee!8082
```
  b8275cdc
- Merge branch 'ee-refactor_gitlab_kube_client' into 'master' · 143ced3c
  Kamil Trzciński authored Oct 25, 2018
```
Refactor Gitlab::KubeClient (EE)

See merge request gitlab-org/gitlab-ee!7831
```
  143ced3c
- Merge branch 'refactor_gitlab_kube_client' into 'master' · 9e6098a6
  Kamil Trzciński authored Oct 25, 2018
```
Refactor Gitlab::KubeClient

Closes #52131

See merge request gitlab-org/gitlab-ce!22073
```
  9e6098a6
- Fixed action & mutation specs · 81944ec9
  Phil Hughes authored Oct 25, 2018
  
  81944ec9
- Merge branch 'ee-52202-consider-moving-isjobstuck-verification-to-backend' into 'master' · acefe12d
  Kamil Trzciński authored Oct 25, 2018
```
EE port of Move job stuck status to backend

See merge request gitlab-org/gitlab-ee!8015
```
  acefe12d
- Merge branch '52202-consider-moving-isjobstuck-verification-to-backend' into 'master' · a5412de5
  Kamil Trzciński authored Oct 25, 2018
```
Move job stuck status to backend

Closes #52202

See merge request gitlab-org/gitlab-ce!22442
```
  a5412de5
- Move job stuck status to backend · 50f703f9
  Steve Azzopardi authored Oct 25, 2018
  
  50f703f9
- Merge branch 'enable_store_sast_report_by_default' into 'master' · b3d51bd9
  Kamil Trzciński authored Oct 25, 2018
```
Enable store security reports by default

See merge request gitlab-org/gitlab-ee!8071
```
  b3d51bd9
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · b759f9b7
  GitLab Bot authored Oct 25, 2018
  
  b759f9b7
- Update the state, not a param · 0fba7cca
  Phil Hughes authored Oct 25, 2018
```
Also fixed a bug where discussions wouldn't be assigned to a line
when switching from discussion tab to changes tab
```
  0fba7cca
- Merge branch 'jlenny-UpdateAndroidTemplate' into 'master' · 5726e51a
  Grzegorz Bizon authored Oct 25, 2018
```
Update Android.gitlab-ci.yml template to current Android SDK version

See merge request gitlab-org/gitlab-ce!22531
```
  5726e51a
- Merge branch '5851-extract-ee-specific-files-lines-for-app-mailers-emails' into 'master' · c9a17420
  Grzegorz Bizon authored Oct 25, 2018
```
Resolve "Extract EE specific files/lines for app/mailers/emails"

Closes #5851

See merge request gitlab-org/gitlab-ee!8050
```
  c9a17420
- Merge branch 'unleash-use-client-features' into 'master' · dbe79c49
  Grzegorz Bizon authored Oct 25, 2018
```
Support `/client/features` Unleash endpoint

Closes #8119

See merge request gitlab-org/gitlab-ee!8045
```
  dbe79c49
- Add changelog entry · c26d9531
  Kushal Pandya authored Oct 24, 2018
  
  c26d9531
- Run through Prettier and remove ESLint disables · a6788c1a
  Kushal Pandya authored Oct 24, 2018
```
Formats the file to match Prettier rules
Removes all blacklisted ESLint rules
```
  a6788c1a