Commits · 16d9aa7afb119e2aa2fd2e43cf525f2ad64db324 · nexedi / gitlab-ce

10 Jan, 2019 25 commits
- Merge branch '9090-follow_up_on_store_container_scanning_results_in_db' into 'master' · 16d9aa7a
  Kamil Trzciński authored Jan 10, 2019
```
Fix container scanning parser

Closes #9090

See merge request gitlab-org/gitlab-ee!9078
```
  16d9aa7a
- Automatic merge of gitlab-org/gitlab-ce master · 7b4a2919
  GitLab Bot authored Jan 10, 2019
  
  7b4a2919
- Merge branch '55945-suggested-change-highlight' into 'master' · da3b20f7
  Phil Hughes authored Jan 10, 2019
```
Add syntax highlighting to suggestion diff

Closes #55945

See merge request gitlab-org/gitlab-ce!24156
```
  da3b20f7
- Add syntax highlighting to suggestion diff · 7e802fee
  Annabel Dunstone Gray authored Jan 10, 2019
  
  7e802fee
- Merge branch 'ce-9090-follow_up_on_store_container_scanning_results_in_db' into 'master' · 33d69aae
  Kamil Trzciński authored Jan 10, 2019
```
Backport container scanning fixtures

See merge request gitlab-org/gitlab-ce!24292
```
  33d69aae
- Automatic merge of gitlab-org/gitlab-ce master · c089f220
  GitLab Bot authored Jan 10, 2019
  
  c089f220
- Merge branch '8688-reduce-ee-differences' into 'master' · 70225e3a
  Phil Hughes authored Jan 10, 2019
```
Reduces EE difference for pipeline graph component

See merge request gitlab-org/gitlab-ee!9075
```
  70225e3a
- Reduces EE difference for pipeline graph component · ffff712d
  Filipa Lacerda authored Jan 10, 2019
  
  ffff712d
- Merge branch 'add-uniqueness-validation-to-url-column-in-releases-link-model' into 'master' · dce04a92
  Kamil Trzciński authored Jan 10, 2019
```
Add uniqueness validation to url column in Releases::Link model

Closes #55929

See merge request gitlab-org/gitlab-ce!24223
```
  dce04a92
- Automatic merge of gitlab-org/gitlab-ce master · 69b4c091
  GitLab Bot authored Jan 10, 2019
  
  69b4c091
- Backport container scanning fixtures · 9f6f42db
  Olivier Gonzalez authored Jan 08, 2019
```
Fix JSON formating and indent
```
  9f6f42db
- Merge branch 'docs/gpg-mention-push-rules' into 'master' · bdc1ebd0
  Achilleas Pipinellis authored Jan 10, 2019
```
Clean up the GPG docs and mention push rules

Closes #42363

See merge request gitlab-org/gitlab-ce!24046
```
  bdc1ebd0
- Clean up the GPG docs and mention push rules · e64df98e
  Achilleas Pipinellis authored Dec 27, 2018
  
  e64df98e
- Merge branch 'docs/geo-styles-and-names' into 'master' · e50ab739
  Achilleas Pipinellis authored Jan 10, 2019
```
Standardise style and nomenclature for Geo documentation

Closes #8231

See merge request gitlab-org/gitlab-ee!7878
```
  e50ab739
- Standardise style and nomenclature for Geo documentation · 5d302102
  Evan Read authored Jan 10, 2019
  
  5d302102
- Automatic merge of gitlab-org/gitlab-ce master · ab6e5b9d
  GitLab Bot authored Jan 10, 2019
  
  ab6e5b9d
- Merge branch... · 5f258b0c
  Grzegorz Bizon authored Jan 10, 2019
```
Merge branch '55628-artifacts-from-a-job-defined-after-a-parallel-job-are-not-downloaded' into 'master'

Resolve "Artifacts from a job defined after a `parallel` job are NOT downloaded"

Closes #55628

See merge request gitlab-org/gitlab-ce!24273
```
  5f258b0c
- Merge branch 'sh-fix-locale-pot' into 'master' · 1a20f683
  Robert Speicher authored Jan 10, 2019
```
Resolve conflicts in locale/gitlab.pot

See merge request gitlab-org/gitlab-ee!9104
```
  1a20f683
- Resolve conflicts in locale/gitlab.pot · 7f30ee4d
  Stan Hu authored Jan 09, 2019
  
  7f30ee4d
- Automatic merge of gitlab-org/gitlab-ce master · 2c3ec87c
  GitLab Bot authored Jan 10, 2019
  
  2c3ec87c
- Merge branch 'docs-group-cicd-settings' into 'master' · b2e807e6
  Evan Read authored Jan 10, 2019
```
Add private runner warnings

Closes #53032

See merge request gitlab-org/gitlab-ce!24274
```
  b2e807e6
- Add private runner warnings · 584964e2
  Matija Čupić authored Jan 10, 2019
  
  584964e2
- Merge branch 'sh-fix-real-size-warnings' into 'master' · 819de8e8
  Robert Speicher authored Jan 10, 2019
```
Fix broken templated "Too many changes to show" text

Closes #56138

See merge request gitlab-org/gitlab-ce!24282
```
  819de8e8
- Automatic merge of gitlab-org/gitlab-ce master · 282a8ba8
  GitLab Bot authored Jan 10, 2019
  
  282a8ba8
- Merge branch 'upgrade-webpack-deps' into 'master' · 337866ef
  Clement Ho authored Jan 10, 2019
```
Upgrade webpack dependencies

See merge request gitlab-org/gitlab-ce!24253
```
  337866ef
09 Jan, 2019 15 commits
- Merge branch 'fix-static-analysis-failure-on-load-balancing-resolver' into 'master' · dade9fd0
  Stan Hu authored Jan 09, 2019
```
Fixes static analysis failure on Resolver

Closes #9122

See merge request gitlab-org/gitlab-ee!9102
```
  dade9fd0
- Dedupe yarn dependencies · c70f6423
  Mike Greiling authored Jan 09, 2019
  
  c70f6423
- Upgrade webpack and all plugins/loaders · 9240815e
  Mike Greiling authored Jan 08, 2019
  
  9240815e
- Fix broken templated "Too many changes to show" text · 488d7d1f
  Stan Hu authored Jan 09, 2019
```
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23230
broke the external string in 11.6. This fixes that and
adds a spec.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56138
```
  488d7d1f
- Fixes static analysis failure on Resolver · 49e884d6
  Mayra Cabrera authored Jan 09, 2019
```
Add frozen_string statement to please our static-analysis
```
  49e884d6
- Automatic merge of gitlab-org/gitlab-ce master · 971e8c57
  GitLab Bot authored Jan 09, 2019
  
  971e8c57
- Merge branch 'gt-update-string-struture-for-group-runners' into 'master' · 4a6c7661
  Fatih Acet authored Jan 09, 2019
```
Update string structure for group runners

See merge request gitlab-org/gitlab-ce!24187
```
  4a6c7661
- Update string structure for group runners · 29acc3b4
  George Tsiolis authored Jan 09, 2019
  
  29acc3b4
- Merge branch 'sh-bump-carrierwave-1.3.1' into 'master' · 928d974a
  Robert Speicher authored Jan 09, 2019
```
Bump CarrierWave to 1.3.1

Closes #56096

See merge request gitlab-org/gitlab-ce!24280
```
  928d974a
- Automatic merge of gitlab-org/gitlab-ce master · 663933b3
  GitLab Bot authored Jan 09, 2019
  
  663933b3
- Merge branch '55178-sentry-issues-service' into 'master' · 6158b512
  Kamil Trzciński authored Jan 09, 2019
```
Service for calling Sentry issues api

See merge request gitlab-org/gitlab-ce!24126
```
  6158b512
- Service for calling Sentry issues api · d69074fc
  Reuben Pereira authored Jan 09, 2019
  
  d69074fc
- Bump CarrierWave to 1.3.1 · c4068856
  Stan Hu authored Jan 09, 2019
```
This avoids an extra HEAD request when making request for auth URL.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56096
```
  c4068856
- Automatic merge of gitlab-org/gitlab-ce master · d491f642
  GitLab Bot authored Jan 09, 2019
  
  d491f642
- Merge branch 'upgrade-babel-deps' into 'master' · 47698eec
  Tim Zallmann authored Jan 09, 2019
```
Upgrade babel to v7.2

See merge request gitlab-org/gitlab-ce!24259
```
  47698eec