Commits · 418e40bfdfb27a8dcf6faf2c5fdb952aa7b5c8a6 · Léo-Paul Géneau / gitlab-ce

11 Jul, 2018 22 commits
- Add newly translated strings to locale/gitlab.pot · 418e40bf
  Dmitriy Zaporozhets authored Jul 10, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  418e40bf
- Add mysql and postgres spec for manifest import button · 543f82ae
  Dmitriy Zaporozhets authored Jul 10, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  543f82ae
- Fix a link to subgroup doc from manifest doc · ac07634e
  Dmitriy Zaporozhets authored Jul 09, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ac07634e
- Improve manifest feature after backend review · 6743147b
  Dmitriy Zaporozhets authored Jul 09, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6743147b
- Improve manifest feature frontend after review · e02efff6
  Dmitriy Zaporozhets authored Jul 09, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e02efff6
- Rename button at manifest import form · 97751ca1
  Dmitriy Zaporozhets authored Jul 09, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  97751ca1
- Make the manifest import feature spec a postgres only · ca3d185d
  Dmitriy Zaporozhets authored Jul 06, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ca3d185d
- Refactor manifest import code · a4b6707e
  Dmitriy Zaporozhets authored Jul 06, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a4b6707e
- Add feature specs for manifest import · 85b0240c
  Dmitriy Zaporozhets authored Jul 06, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  85b0240c
- Move manifest import to separate page and add feature specs · 4cee5d2e
  Dmitriy Zaporozhets authored Jul 06, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4cee5d2e
- Fix icon for manifest import and mention manifest feature in API · 0f9dacf4
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0f9dacf4
- Add documentation for manifest import feature · b42b3796
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b42b3796
- Add ability to disable manifest import · 98d29f6e
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  98d29f6e
- Improve manifest import logic · 68f8ae26
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  68f8ae26
- More reliable manifest parser and group-only selector · 237a3597
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  237a3597
- Fix tests in import_sources_spec.rb · 1885a301
  Dmitriy Zaporozhets authored Jul 05, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1885a301
- Add changelog for manifest import feature · c1af6e4b
  Dmitriy Zaporozhets authored Jul 04, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c1af6e4b
- Add manifest import feature · 88e64037
  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>
```
  88e64037
- 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
- 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
10 Jul, 2018 18 commits
- 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
- 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
- Merge branch 'bvl-remove-pot-timestamps' into 'master' · 5bd8bfb6
  Rémy Coutable authored Jul 10, 2018
```
Remove timestamps from `locale/gitlab.pot`

Closes #49077

See merge request gitlab-org/gitlab-ce!20533
```
  5bd8bfb6
- Remove timestamps from `locale/gitlab.pot` · f6d22ec1
  Bob Van Landuyt authored Jul 10, 2018
```
This will help us avoid conflicts when regenerating the pot file, the
timestamps aren't used by Crowdin.
```
  f6d22ec1
- Merge branch 'add-dst-support-to-pipeline-schedule' into 'master' · 49d7f92f
  Kamil Trzciński authored Jul 10, 2018
```
Add daylight saving time support for pipeline schedules

Closes #37165

See merge request gitlab-org/gitlab-ce!20145
```
  49d7f92f
- Add daylight saving time support for pipeline schedules · 798608af
  Collen authored Jul 10, 2018
  
  798608af
- Merge branch 'fix-conflicts-exception-for-submodules' into 'master' · b40e71d6
  Rémy Coutable authored Jul 10, 2018
```
Make sure ConflictsService does not raise for conflicting submodules

See merge request gitlab-org/gitlab-ce!20528
```
  b40e71d6
- Merge branch 'patch-28' into 'master' · c9e4def9
  Rémy Coutable authored Jul 10, 2018
```
Fix a typo on CI Runner page on Projects

See merge request gitlab-org/gitlab-ce!20467
```
  c9e4def9
- Fix a typo on CI Runner page on Projects · fa39876e
  Ave authored Jul 10, 2018
  
  fa39876e
- Merge branch... · 0abda34c
  Robert Speicher authored Jul 10, 2018
```
Merge branch 'rd-6804-bug-unable-to-delete-branches-when-repo-reaches-the-size-limit-ce' into 'master'

Backport some changes from EE

See merge request gitlab-org/gitlab-ce!20388
```
  0abda34c
- Make sure ConflictsService does not raise for conflicting submodules · 57fc7cd8
  Sean McGivern authored Jul 10, 2018
  
  57fc7cd8
- Merge branch 'revert-3755d828' into 'master' · d01e5a04
  Phil Hughes authored Jul 10, 2018
```
Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"

See merge request gitlab-org/gitlab-ce!20525
```
  d01e5a04
- Merge branch '49057-fix-repository-typo' into 'master' · 7358211e
  Rémy Coutable authored Jul 10, 2018
```
Fix a typo in Gitlab::Git::Repository

See merge request gitlab-org/gitlab-ce!20520
```
  7358211e
- Merge branch '48578-disable-gcp-free-credit-banner-at-instance-level' into 'master' · b7531f71
  Rémy Coutable authored Jul 10, 2018
```
Resolve "Disable GCP free credit banner at instance level"

Closes #48578

See merge request gitlab-org/gitlab-ce!20379
```
  b7531f71
- Resolve "Disable GCP free credit banner at instance level" · fe268175
  Dennis Tang authored Jul 10, 2018
  
  fe268175