Commits · be686e127ac7a95a04dc3227eed59eee860ffe60 · nexedi / gitlab-ce

02 Sep, 2019 40 commits
- Dont mix positional and named args · be686e12
  Sean Carroll authored Aug 30, 2019
  
  be686e12
- Apply suggestion to lib/gitlab/optimistic_locking.rb · e4bfca48
  Sean Carroll authored Aug 30, 2019
  
  e4bfca48
- Apply suggestion to ee/app/services/merge_trains/refresh_merge_request_service.rb · d2f6b310
  Sean Carroll authored Aug 30, 2019
  
  d2f6b310
- Apply suggestion to app/models/ci/pipeline.rb · 8cb3d7aa
  Sean Carroll authored Aug 30, 2019
  
  8cb3d7aa
- Apply suggestion to app/models/ci/pipeline.rb · 93d827a9
  Sean Carroll authored Aug 30, 2019
  
  93d827a9
- Apply suggestion to app/models/ci/pipeline.rb · d9df37e0
  Sean Carroll authored Aug 30, 2019
  
  d9df37e0
- Apply suggestion to app/models/ci/pipeline.rb · 1c03003b
  Sean Carroll authored Aug 30, 2019
  
  1c03003b
- Add retries param to auto_cancel_running · 9fa0dbb8
  Sean Carroll authored Aug 30, 2019
  
  9fa0dbb8
- Prefer reset to multi-reloads · e5383e64
  Sean Carroll authored Aug 29, 2019
  
  e5383e64
- Refactor for code readability · 1f2ecd84
  Sean Carroll authored Aug 29, 2019
  
  1f2ecd84
- Fix Rubocop violation · 00eec9ca
  Sean Carroll authored Aug 29, 2019
  
  00eec9ca
- Fix Rubocop violation · 58980327
  Sean Carroll authored Aug 28, 2019
  
  58980327
- Simplify execute method · d5e86f1a
  Sean Carroll authored Aug 28, 2019
  
  d5e86f1a
- Handle already canceled pipelines · dc22f476
  Sean Carroll authored Aug 28, 2019
  
  dc22f476
- Remove unneeded method · 7b6b802d
  Sean Carroll authored Aug 28, 2019
  
  7b6b802d
- Cancel pipeline with auto_cancel_running · d586377a
  Sean Carroll authored Aug 28, 2019
  
  d586377a
- Adds project changelog · 99f24557
  Sean Carroll authored Aug 26, 2019
  
  99f24557
- Cancel rendundant pipelines · 03ff8139
  Sean Carroll authored Aug 07, 2019
  
  03ff8139
- Merge branch 'rename-sync-service-ee' into 'master' · e74c7bad
  Douglas Barbosa Alexandre authored Sep 02, 2019
```
Rename Geo::BaseSyncService class

Closes #12275

See merge request gitlab-org/gitlab-ee!15779
```
  e74c7bad
- Automatic merge of gitlab-org/gitlab-ce master · e2ee145c
  GitLab Bot authored Sep 02, 2019
  
  e2ee145c
- Merge branch 'ab-admin-page-user-active-count' into 'master' · f4e40c53
  Andreas Brandl authored Sep 02, 2019
```
Replace indexes for counting active users

See merge request gitlab-org/gitlab-ce!32538
```
  f4e40c53
- Merge branch 'ab-admin-page-user-active-count' into 'master' · aaf243e7
  Andreas Brandl authored Sep 02, 2019
```
Replace indexes for counting active users

See merge request gitlab-org/gitlab-ce!32538
```
  aaf243e7
- Automatic merge of gitlab-org/gitlab-ce master · ffbaf106
  GitLab Bot authored Sep 02, 2019
  
  ffbaf106
- Merge branch '66791-handle-different-listen-address-formats' into 'master' · 6cfab760
  Sean McGivern authored Sep 02, 2019
```
Handle :9090 and 0.0.0.0:9090 listen_address formats

See merge request gitlab-org/gitlab-ce!32456
```
  6cfab760
- Handle :9090 and 0.0.0.0:9090 listen_address formats · 414523b0
  Reuben Pereira authored Sep 02, 2019
```
Prometheus listen_address can be in formats of :9090 and 0.0.0.0:9090.
But before these can be used to connect a project to Prometheus, they
have to converted into absolute URIs.
```
  414523b0
- Update CHANGELOG.md for 12.2.4 · f6de6302
  GitLab Release Tools Bot authored Sep 02, 2019
```
[ci skip]
```
  f6de6302
- Update CHANGELOG-EE.md for 12.2.4-ee · 2abdf334
  GitLab Release Tools Bot authored Sep 02, 2019
```
[ci skip]
```
  2abdf334
- Update CHANGELOG.md for 12.2.4 · 2d3dc05f
  GitLab Release Tools Bot authored Sep 02, 2019
```
[ci skip]
```
  2d3dc05f
- Automatic merge of gitlab-org/gitlab-ce master · 518338ea
  GitLab Bot authored Sep 02, 2019
  
  518338ea
- Merge branch 'ee-66791-handle-different-listen-address-formats' into 'master' · 296e93a4
  Sean McGivern authored Sep 02, 2019
```
Handle :9090 and 0.0.0.0:9090 listen_address formats

See merge request gitlab-org/gitlab-ee!15890
```
  296e93a4
- Handle :9090 and 0.0.0.0:9090 listen_address formats · ed1b6129
  Reuben Pereira authored Sep 02, 2019
```
Prometheus listen_address can be in formats of :9090 and 0.0.0.0:9090.
But before these can be used to connect a project to Prometheus, they
have to converted into absolute URIs.
```
  ed1b6129
- Merge branch 'docs/license-compliance' into 'master' · d645196c
  Marcia Ramos authored Sep 02, 2019
```
Update screenshots for License Compliance

Closes gitlab-ee#8910

See merge request gitlab-org/gitlab-ce!32537
```
  d645196c
- Merge branch '65152-unfolded-lines-perf-improvement' into 'master' · 68bfb091
  Douwe Maan authored Sep 02, 2019
```
Support selective highlighting of lines

See merge request gitlab-org/gitlab-ce!32514
```
  68bfb091
- Automatic merge of gitlab-org/gitlab-ce master · 33da820c
  GitLab Bot authored Sep 02, 2019
  
  33da820c
- Merge branch 'docs-maven-repo-cli-credentials' into 'master' · 1a060f7d
  Achilleas Pipinellis authored Sep 02, 2019
```
Added example for passing Maven repo credentials

Closes gitlab-ee#6711

See merge request gitlab-org/gitlab-ce!32073
```
  1a060f7d
- Added example for passing Maven repo credentials · c1000b79
  Matt Penna authored Sep 02, 2019
  
  c1000b79
- Automatic merge of gitlab-org/gitlab-ce master · 0d246dd8
  GitLab Bot authored Sep 02, 2019
  
  0d246dd8
- Merge branch 'docs-james-gill-contribution' into 'master' · 12936a8d
  Achilleas Pipinellis authored Sep 02, 2019
```
Docs james gill contribution

See merge request gitlab-org/gitlab-ce!32520
```
  12936a8d
- Docs james gill contribution · a52f394b
  Marcel Amirault authored Sep 02, 2019
  
  a52f394b
- Merge branch 'pl-fix-chat-notification-service' into 'master' · bdd67a65
  Stan Hu authored Sep 02, 2019
```
CE: Reduce amount of property definitions in ChatNotificationService

See merge request gitlab-org/gitlab-ce!32363
```
  bdd67a65