Commits · bcc0306493e7c60a38dd08f4919e635594a5c988 · nexedi / gitlab-ce

08 Oct, 2018 20 commits
- Merge branch 'update_extends_docs' into 'master' · bcc03064
  Achilleas Pipinellis authored Oct 08, 2018
```
Update explanation about the `extends` feature

See merge request gitlab-org/gitlab-ce!22043
```
  bcc03064
- Update explanation about the `extends` feature · 6481b44b
  Ronald van Zon authored Oct 08, 2018
  
  6481b44b
- Merge branch 'docs-docker-auth-config-port' into 'master' · 74e49d2f
  Achilleas Pipinellis authored Oct 08, 2018
```
Add note about hostname *and* port needing to match for `DOCKER_AUTH_CONFIG`

See merge request gitlab-org/gitlab-ce!22064
```
  74e49d2f
- Merge branch 'docs/fix-link-to-deploy-boards' into 'master' · 04a16259
  Achilleas Pipinellis authored Oct 08, 2018
```
Fix link to EE-only doc and fix lint issues

See merge request gitlab-org/gitlab-ce!22178
```
  04a16259
- Merge branch 'docs/fix-link-to-mr-template' into 'master' · 56a7e990
  Achilleas Pipinellis authored Oct 08, 2018
```
Fix link to MR-template and other improvements

See merge request gitlab-org/gitlab-ce!22179
```
  56a7e990
- Merge branch 'patch/gpg-doc' into 'master' · 524b41c0
  Achilleas Pipinellis authored Oct 08, 2018
```
Fix indentation in GPG documentation

See merge request gitlab-org/gitlab-ce!22132
```
  524b41c0
- Merge branch 'more-frozen-string-enable-lib' into 'master' · 79279f44
  Rémy Coutable authored Oct 08, 2018
```
Enable more frozen string in lib/**/*.rb

See merge request gitlab-org/gitlab-ce!22174
```
  79279f44
- Merge branch 'rails5-mysql-schedule-build' into 'master' · 7f22bc98
  Douwe Maan authored Oct 08, 2018
```
Rails 5: fix mysql milliseconds problems in scheduled build specs

See merge request gitlab-org/gitlab-ce!22170
```
  7f22bc98
- Merge branch 'update-templates-11-4' into 'master' · e8f4bfd1
  Kamil Trzciński authored Oct 08, 2018
```
Update templates for 11.4

See merge request gitlab-org/gitlab-ce!22188
```
  e8f4bfd1
- Merge branch 'increase-event-retention-prune-old-events-worker' into 'master' · 651039ac
  Douwe Maan authored Oct 08, 2018
```
Prune events older than 2 years instead of 12 months

See merge request gitlab-org/gitlab-ce!22145
```
  651039ac
- Merge branch 'sh-remove-duplicate-logging' into 'master' · 0e8fc926
  Douwe Maan authored Oct 08, 2018
```
Remove duplicate Sentry logging for GRPC exceptions

See merge request gitlab-org/gitlab-ce!22187
```
  0e8fc926
- Merge branch 'update-licenses-11-4' into 'master' · 7f8025e1
  Sean McGivern authored Oct 08, 2018
```
Update licenses for 11.4

See merge request gitlab-org/gitlab-ce!22189
```
  7f8025e1
- Merge branch 'backport-ce-to-ee-spec-fix' into 'master' · 838c1076
  Rémy Coutable authored Oct 08, 2018
```
Fix issues controller N+1 failure

See merge request gitlab-org/gitlab-ce!22141
```
  838c1076
- Merge branch 'patch-29' into 'master' · bdb7ebf8
  Kamil Trzciński authored Oct 08, 2018
```
Updates Laravel.gitlab-ci.yml template

See merge request gitlab-org/gitlab-ce!22167
```
  bdb7ebf8
- Merge branch 'zj-render-log-artifacts' into 'master' · b86631a5
  Kamil Trzciński authored Oct 08, 2018
```
Render log artifact files in GitLab

See merge request gitlab-org/gitlab-ce!22112
```
  b86631a5
- Render log artifact files in GitLab · 129a60e7
  Zeger-Jan van de Weg authored Oct 08, 2018
  
  129a60e7
- Updated licenses for 11.4 · 58b6b414
  Jan Provaznik authored Oct 08, 2018
  
  58b6b414
- Update templates for 11.4 · 339878e4
  Jan Provaznik authored Oct 08, 2018
  
  339878e4
- Remove duplicate Sentry logging for GRPC messages · 7fa31808
  Stan Hu authored Oct 07, 2018
```
Raven.capture_exception is already called by log_exception.
```
  7fa31808
- Fix link to MR-template and other improvements · b1074f6a
  Evan Read authored Oct 08, 2018
  
  b1074f6a
07 Oct, 2018 2 commits

Fix link to EE-only doc and fix lint issues · 3c79174c
Evan Read authored Oct 08, 2018

3c79174c

Enable more frozen string in lib/**/*.rb · d598e4fd

gfyoung authored Oct 06, 2018

Enables frozen for the following:

* lib/*.rb
* lib/banzai/**/*.rb
* lib/bitbucket/**/*.rb
* lib/constraints/**/*.rb
* lib/container_registry/**/*.rb
* lib/declarative_policy/**/*.rb

Partially addresses #47424.

d598e4fd

06 Oct, 2018 17 commits
- Merge branch 'bw-fix-checking-disabled-services' into 'master' · c3389c80
  Stan Hu authored Oct 06, 2018
```
Check disabled_services when finding a service

See merge request gitlab-org/gitlab-ce!22172
```
  c3389c80
- Check disabled_services when finding a service · f934b216
  Brett Walker authored Oct 06, 2018
  
  f934b216
- Merge branch '52242-ui-ux-bug-in-change-group-path' into 'master' · 2fce6d6f
  Douglas Barbosa Alexandre authored Oct 06, 2018
```
Fix invalid parent path on group settings page

Closes #52242

See merge request gitlab-org/gitlab-ce!22142
```
  2fce6d6f
- Fix invalid parent path on group settings page · 75b2c9bf
  Dmitriy Zaporozhets authored Oct 06, 2018
  
  75b2c9bf
- Merge branch 'ce-1984-frontend-for-batch-comments' into 'master' · 4c351e17
  Tim Zallmann authored Oct 06, 2018
```
Backport CE changes for: [Frontend only] Batch comments on merge requests

See merge request gitlab-org/gitlab-ce!22158
```
  4c351e17
- Backport CE changes for: [Frontend only] Batch comments on merge requests · 8e5c0e68
  André Luís authored Oct 06, 2018
  
  8e5c0e68
- Merge branch 'add-button-to-insert-table-in-markdown' into 'master' · 54c442af
  Clement Ho authored Oct 06, 2018
```
Add button to insert table in markdown editor

See merge request gitlab-org/gitlab-ce!18480
```
  54c442af
- Add button to insert table in markdown editor · e9f7908f
  George Tsiolis authored Oct 06, 2018
  
  e9f7908f
- Rails 5: fix mysql milliseconds problems in scheduled build specs · 043f899b
  Jasper Maes authored Oct 06, 2018
  
  043f899b
- Merge branch 'gitaly-0.125.0' into 'master' · 50c9a09a
  Stan Hu authored Oct 06, 2018
```
Bump Gitaly to v0.125.0

See merge request gitlab-org/gitlab-ce!22168
```
  50c9a09a
- Merge branch 'backport-ce-to-ee-merge' into 'master' · bedd5769
  Stan Hu authored Oct 06, 2018
```
Backport of CE upstream - 2018-10-05 12:21 UTC

See merge request gitlab-org/gitlab-ce!22154
```
  bedd5769
- Updated docs to reflect new 2 year period · 6170bfd8
  Jeremy Watson authored Oct 06, 2018
  
  6170bfd8
- Updated code comments for clarity based on 2 years · 533a6fef
  Jeremy Watson authored Oct 06, 2018
  
  533a6fef
- Update GITALY_SERVER_VERSION · c812d17e
  James Lopez authored Oct 06, 2018
  
  c812d17e
- Updates Laravel.gitlab-ci.yml template · 71ffca52
  Paul Giberson authored Oct 06, 2018
```
Updates to add gnupgp (required for node setup)
Upgrades node install to version 8
```
  71ffca52
- Added changelog · b0ae67a4
  Jeremy Watson authored Oct 06, 2018
  
  b0ae67a4
- Merge branch 'update-operations-metrics-empty-state' into 'master' · 1239629c
  Mike Greiling authored Oct 06, 2018
```
Update operations metrics empty state

See merge request gitlab-org/gitlab-ce!21974
```
  1239629c
05 Oct, 2018 1 commit
- Update operations metrics empty state · ef6f2b28
  George Tsiolis authored Sep 27, 2018
  
  ef6f2b28