Commits · 2b79d9129b764011b40f3f6fa0957a96be539116 · nexedi / gitlab-ce

11 Jul, 2018 30 commits
- Improve manifest feature frontend after review · 2b79d912
  Dmitriy Zaporozhets authored Jul 09, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2b79d912
- Rename button at manifest import form · eeff4d2c
  Dmitriy Zaporozhets authored Jul 09, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  eeff4d2c
- Make the manifest import feature spec a postgres only · 5e5ca6b7
  Dmitriy Zaporozhets authored Jul 06, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5e5ca6b7
- Refactor manifest import code · aaf508df
  Dmitriy Zaporozhets authored Jul 06, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aaf508df
- Add feature specs for manifest import · 19b9c1b7
  Dmitriy Zaporozhets authored Jul 06, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  19b9c1b7
- Move manifest import to separate page and add feature specs · 3a60cb4b
  Dmitriy Zaporozhets authored Jul 06, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3a60cb4b
- Fix icon for manifest import and mention manifest feature in API · 97821bb4
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  97821bb4
- Add documentation for manifest import feature · 3650da16
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3650da16
- Add ability to disable manifest import · 5e1b82a7
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5e1b82a7
- Improve manifest import logic · 706e7620
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  706e7620
- More reliable manifest parser and group-only selector · 5e0e3437
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5e0e3437
- Fix tests in import_sources_spec.rb · 515eac8d
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  515eac8d
- Add manifest import feature · 360a3820
  Dmitriy Zaporozhets authored Jul 02, 2018
```
It allows user to automatically import multiple repositories
with nested structure by uploading a manifest xml file.

AOSP project was used as an example during development of this feature.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  360a3820
- Merge branch 'patch-7' into 'master' · 3ee4d98e
  Marcia Ramos authored Jul 11, 2018
```
Removed copy-pasted "Project merge method" section.

See merge request gitlab-org/gitlab-ee!5844
```
  3ee4d98e
- Merge branch 'ce-to-ee-2018-07-11' into 'master' · 13e2ca52
  Dmitriy Zaporozhets authored Jul 11, 2018
```
CE upstream - 2018-07-11 09:25 UTC

See merge request gitlab-org/gitlab-ee!6457
```
  13e2ca52
- Merge branch 'ee-jl-fix-object-storage-support-docs' into 'master' · 3c7cd2f9
  Marcia Ramos authored Jul 11, 2018
```
Fix formatting of object storage supported editions

See merge request gitlab-org/gitlab-ee!6372
```
  3c7cd2f9
- fix link and wrap · e24b3345
  Marcia Ramos authored Jul 09, 2018
  
  e24b3345
- Fix conflict in locale/gitlab.pot · ebeaf2df
  Dmitriy Zaporozhets authored Jul 11, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ebeaf2df
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-11 · 4f827d1e
  GitLab Bot authored Jul 11, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  4f827d1e
- Merge branch 'ce-to-ee-2018-07-10' into 'master' · 4cefac10
  Dmitriy Zaporozhets authored Jul 11, 2018
```
CE upstream - 2018-07-10 15:22 UTC

Closes gitaly#387, gitaly#874, gitaly#750, and gitaly#665

See merge request gitlab-org/gitlab-ee!6453
```
  4cefac10
- Merge branch 'runners-max-timeout-param' into 'master' · eae40e70
  Rémy Coutable authored Jul 11, 2018
```
Add missing maximum_timeout parameter

Closes #48625

See merge request gitlab-org/gitlab-ce!20355
```
  eae40e70
- Add missing maximum_timeout parameter · 068defa7
  gfyoung authored Jul 11, 2018
  
  068defa7
- Merge branch 'rails5-autoload' into 'master' · e68a547b
  Sean McGivern authored Jul 11, 2018
```
[Rails5] Permit concurrent loads

Closes #48263

See merge request gitlab-org/gitlab-ce!20473
```
  e68a547b
- Merge branch 'fix-doc-on-migration' into 'master' · 078c824f
  Sean McGivern authored Jul 11, 2018
```
Fix doc for large table column rename

See merge request gitlab-org/gitlab-ce!20544
```
  078c824f
- Merge branch '6857-missed-mr-widget-states' into 'master' · 78db7be9
  Filipa Lacerda authored Jul 11, 2018
```
Resolve "MR Widget redesign was not done for license management / security products."

Closes #6857

See merge request gitlab-org/gitlab-ee!6440
```
  78db7be9
- Merge branch 'update-uid-gid-docs-for-ha-docs' into 'master' · d3902596
  Marin Jankovski authored Jul 11, 2018
```
adding a note to HA docs that omnibus will not recursively chown directories…

See merge request gitlab-org/gitlab-ee!6439
```
  d3902596
- adding a note to HA docs that omnibus will not recursively chown directories… · cab8d2f1
  Aric Buerer authored Jul 11, 2018
  
  cab8d2f1
- Fix doc for large table column rename · 2be54f1b
  Mark Chao authored Jul 11, 2018
  
  2be54f1b
- Merge branch 'sh-handle-colons-in-url-passwords' into 'master' · c6b67021
  James Lopez authored Jul 11, 2018
```
Properly handle colons in URL passwords

Closes #49080

See merge request gitlab-org/gitlab-ce!20538
```
  c6b67021
- Remove unnecessary tests · 49158837
  Shinya Maeda authored Jul 11, 2018
  
  49158837
10 Jul, 2018 10 commits
- Add generic media-section class to report_section · 2539f110
  Annabel Dunstone Gray authored Jul 10, 2018
  
  2539f110
- Merge branch 'sh-fix-git-gc-error-handling' into 'master' · c2a0a3ab
  Robert Speicher authored Jul 10, 2018
```
Fix ArgumentError in GitGarbageCollectWorker Sidekiq job

Closes #49096

See merge request gitlab-org/gitlab-ce!20541
```
  c2a0a3ab
- Remove padding on pipeline detail security report · efdf7759
  Annabel Dunstone Gray authored Jul 10, 2018
  
  efdf7759
- Fix ArgumentError in GitGarbageCollectWorker Sidekiq job · 0c1eebe2
  Stan Hu authored Jul 10, 2018
```
When the Gitaly call failed, the exception handling failed
because `method` is expected to have a parameter.

Closes #49096
```
  0c1eebe2
- Properly handle colons in URL passwords · 718a23fd
  Stan Hu authored Jul 10, 2018
```
Before b46d5b13, we relied on
`Addressable::URI` to parse the username/password in a URL, but this failed
when credentials contained special characters. However, this introduced a regression
where the parsing would incorrectly truncate the password if the password had a colon.

Closes #49080
```
  718a23fd
- Merge branch 'winh-speedup-smartinterval-tests' into 'master' · 9e72e5e6
  Mike Greiling authored Jul 10, 2018
```
Mock timeouts and Promise in SmartInterval tests

See merge request gitlab-org/gitlab-ce!20496
```
  9e72e5e6
- Mock timeouts and Promise in SmartInterval tests · 66ad04e4
  Winnie Hellmann authored Jul 10, 2018
  
  66ad04e4
- Fix conflict for locale/gitlab.pot · d90d623d
  Rubén Dávila authored Jul 10, 2018
  
  d90d623d
- Fix clonflicts for lib/gitlab/git_access.rb and spec/lib/gitlab/git_access_spec.rb · 41096704
  Rubén Dávila authored Jul 10, 2018
  
  41096704
- Resolve conflict in spec/serializers/environment_entity_spec.rb · 359cfcc7
  Winnie Hellmann authored Jul 10, 2018
  
  359cfcc7