Commits · 2822861e2cae1fbaf3f362cf3c5f95df8ede84ca · nexedi / gitlab-ce

24 Mar, 2018 1 commit
- Resolve conflict in app/helpers/application_settings_helper.rb · 2822861e
  Stan Hu authored Mar 24, 2018
  
  2822861e
23 Mar, 2018 39 commits
- Resolve conflict in `safe_model_attributes.yml` · df179a2d
  Bob Van Landuyt authored Mar 23, 2018
```
[skip ci]
```
  df179a2d
- Resolve conflict on db/schema.rb · 91112906
  Douglas Barbosa Alexandre authored Mar 23, 2018
  
  91112906
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-23 · b31b7441
  GitLab Bot authored Mar 23, 2018
```
# Conflicts:
#	app/helpers/application_settings_helper.rb
#	app/models/group.rb
#	db/schema.rb
#	spec/initializers/6_validations_spec.rb
#	spec/lib/gitlab/import_export/safe_model_attributes.yml

[ci skip]
```
  b31b7441
- Merge branch 'ce-to-ee-2018-03-23' into 'master' · eedc383f
  Robert Speicher authored Mar 23, 2018
```
CE upstream - 2018-03-23 06:25 UTC

Closes charts/helm.gitlab.io#291 and gitlab-ce#43937

See merge request gitlab-org/gitlab-ee!5093
```
  eedc383f
- Merge branch '5178-geo-verification-rename-log' into 'master' · 7f6a9245
  Stan Hu authored Mar 23, 2018
```
Use geo.log for secondary repository verification logging

Closes #5178

See merge request gitlab-org/gitlab-ee!5095
```
  7f6a9245
- Use geo.log for secondary repository verification logging · 00d231c4
  Brett Walker authored Mar 23, 2018
  
  00d231c4
- Merge branch 'docs/gitlab-com-settings' into 'master' · df89beb5
  Marcia Ramos authored Mar 23, 2018
```
Move GitLab.com settings under main docs

See merge request gitlab-org/gitlab-ce!17968
```
  df89beb5
- Merge branch 'docs/gitlab-com-settings-ee' into 'master' · c2cb9a3d
  Marcia Ramos authored Mar 23, 2018
```
Move GitLab.com settings under main docs

See merge request gitlab-org/gitlab-ee!5099
```
  c2cb9a3d
- Move GitLab.com settings under main docs · 20fcf47d
  Achilleas Pipinellis authored Mar 23, 2018
  
  20fcf47d
- Merge branch '5105_split_dependency_scanning_from_sast' into 'master' · c8c88126
  Dmitriy Zaporozhets authored Mar 23, 2018
```
Add Dependency Scanning feature and expose its artifacts in Merge Request

See merge request gitlab-org/gitlab-ee!5051
```
  c8c88126
- Merge branch 'gitlab-shell-7.1.1' into 'master' · fa050c00
  Douwe Maan authored Mar 23, 2018
```
Use gitlab-shell 7.1.1

See merge request gitlab-org/gitlab-ce!17959
```
  fa050c00
- Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master' · 0bd14972
  Robert Speicher authored Mar 23, 2018
```
Fix EncodingHelper#clean blowing up on UTF-16BE strings

Closes gitaly#1101

See merge request gitlab-org/gitlab-ce!17943
```
  0bd14972
- Merge branch 'sh-add-geo-db-rollback-test' into 'master' · 1c21d6d1
  Robert Speicher authored Mar 23, 2018
```
Add Geo tracking DB rollback CI step

See merge request gitlab-org/gitlab-ee!5090
```
  1c21d6d1
- Move GitLab.com settings under main docs · 433a6b02
  Achilleas Pipinellis authored Mar 23, 2018
  
  433a6b02
- Merge branch 'sh-improve-rollback-test' into 'master' · e583524d
  Robert Speicher authored Mar 23, 2018
```
Rollback to a set version instead of an arbitrary number of steps

Closes #40302

See merge request gitlab-org/gitlab-ce!17947
```
  e583524d
- Merge branch '44587-autolinking-includes-trailing-exclamation-marks' into 'master' · 7fc09da4
  Robert Speicher authored Mar 23, 2018
```
Resolve "Autolinking includes trailing exclamation marks"

Closes #44587

See merge request gitlab-org/gitlab-ce!17965
```
  7fc09da4
- Merge branch 'webpack-config-fix' into 'master' · 67b2f2cd
  Filipa Lacerda authored Mar 23, 2018
```
Remove trailinng comma in webpack config

See merge request gitlab-org/gitlab-ee!5098
```
  67b2f2cd
- Merge branch 'performance-bar-vue-resource' into 'master' · 757da4dd
  Filipa Lacerda authored Mar 23, 2018
```
Add Vue resource interceptor to performance bar

See merge request gitlab-org/gitlab-ce!17915
```
  757da4dd
- Add ?, !, and : to trailing puncutation excluded from auto-linking · 058dd193
  Sean McGivern authored Mar 23, 2018
  
  058dd193
- Merge branch 'pages_force_https' into 'master' · 457a99c6
  Nick Thomas authored Mar 23, 2018
```
HTTPS only Pages

Closes #28857

See merge request gitlab-org/gitlab-ce!16273
```
  457a99c6
- Resolve conflicts · 0c15388b
  Robert Speicher authored Mar 23, 2018
  
  0c15388b
- Merge branch 'sh-update-loofah' into 'master' · 79dd74db
  Robert Speicher authored Mar 23, 2018
```
Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4

Closes #44554

See merge request gitlab-org/gitlab-ce!17945
```
  79dd74db
- Merge branch '5178-geo-verification-repository-path-cleanup' into 'master' · 42f550e4
  Nick Thomas authored Mar 23, 2018
```
Geo - Cleanup repository path implementation

Closes #5178

See merge request gitlab-org/gitlab-ee!5082
```
  42f550e4
- Merge branch 'patch-28' into 'master' · b06a44c4
  Sean McGivern authored Mar 23, 2018
```
Update the menu information to access "Schedules" page

See merge request gitlab-org/gitlab-ce!17957
```
  b06a44c4
- Merge branch 'tz-prettier-print-width-100' into 'master' · 7e759f55
  Clement Ho authored Mar 23, 2018
```
Update Prettier Print Width to 100

See merge request gitlab-org/gitlab-ce!17953
```
  7e759f55
- Merge branch 'tz-ee-prettier-print-width-100' into 'master' · 82cd5c4a
  Clement Ho authored Mar 23, 2018
```
Updated Prettier Print Width to 100

See merge request gitlab-org/gitlab-ee!5096
```
  82cd5c4a
- Remove trailinng comma in webpack config · ceb671b7
  Phil Hughes authored Mar 23, 2018
  
  ceb671b7
- Merge branch '43525-limit-number-of-failed-logins-using-ldap' into 'master' · f8401d5c
  Douwe Maan authored Mar 23, 2018
```
Resolve "Limit number of failed logins using LDAP for authentication"

Closes #43525

See merge request gitlab-org/gitlab-ce!17886
```
  f8401d5c
- Merge branch 'patch-1' into 'master' · 32614419
  Sean McGivern authored Mar 23, 2018
```
Request Chinese Traditional proofreader permissions.

See merge request gitlab-org/gitlab-ce!17762
```
  32614419
- Use gitlab-shell 7.1.1 · bfdb3f20
  Jacob Vosmaer authored Mar 23, 2018
  
  bfdb3f20
- Update the menu information to access "Schedules" page · 2fe8329c
  Bertrand Jamin authored Mar 23, 2018
  
  2fe8329c
- Resolve conflict in app/views/projects/branches/_branch.html.haml · 2d2c0fbb
  Toon Claes authored Mar 23, 2018
  
  2d2c0fbb
- Resolve conflict in app/views/layouts/_page.html.haml · e8d70ec6
  Toon Claes authored Mar 23, 2018
  
  e8d70ec6
- Merge branch 'storage-dropdown' into 'master' · 3cd95700
  Sean McGivern authored Mar 23, 2018
```
Show gitaly address instead of disk path

See merge request gitlab-org/gitlab-ce!17954
```
  3cd95700
- Merge branch 'jprovazn-issueref' into 'master' · f56ef206
  Douwe Maan authored Mar 23, 2018
```
Fix issuable state indicator

Closes gitlab-ee#4683

See merge request gitlab-org/gitlab-ce!17878
```
  f56ef206
- Show gitaly address instead of disk path · 0189ee97
  Jacob Vosmaer authored Mar 23, 2018
  
  0189ee97
- Merge branch '43771-improve-avatar-error-message' into 'master' · 49e87168
  Sean McGivern authored Mar 23, 2018
```
Resolve "Indicate supported image formats in avatar error"

Closes #43771

See merge request gitlab-org/gitlab-ce!17747
```
  49e87168
- Merge branch 'ee-43771-improve-avatar-error-message' into 'master' · 7af2a91b
  Sean McGivern authored Mar 23, 2018
```
Change avatar error message to include allowed file formats

See merge request gitlab-org/gitlab-ee!5094
```
  7af2a91b
- Merge branch 'add-geo-temporary-to-docs' into 'master' · 5b16f761
  Achilleas Pipinellis authored Mar 23, 2018
```
Geo: Document @geo-temporary directory

Closes #5349

See merge request gitlab-org/gitlab-ee!5080
```
  5b16f761