Commits · ffcc200a68fd6d08707a8fd70b128a79206fd69e · nexedi / gitlab-ce

07 Nov, 2018 40 commits
- fix allowed keys validator to use correct attribute as error base? · ffcc200a
  Markus Doits authored Sep 19, 2018
  
  ffcc200a
- add specs for create pipeline service and new retry when feature · 452a4399
  Markus Doits authored Sep 19, 2018
  
  452a4399
- update job config validator to validate new retry syntax · 0db50a80
  Markus Doits authored Sep 19, 2018
  
  0db50a80
- add changelog entry · 42f36954
  Markus Doits authored Sep 19, 2018
  
  42f36954
- fix some spec wording and values · 93705f9e
  Markus Doits authored Sep 17, 2018
  
  93705f9e
- refactor retry logic to define any reason and more than one reason to retry · 39204d8c
  Markus Doits authored Sep 15, 2018
  
  39204d8c
- add `retry_failure?` option and use it to decide if to retry a build failure · 007db85d
  Markus Doits authored Sep 15, 2018
  
  007db85d
- add an option when to retry a build (unused yet) · 473b52b2
  Markus Doits authored Sep 15, 2018
  
  473b52b2
- allow retries to be a hash · d71a7797
  Markus Doits authored Sep 15, 2018
```
- when it is a hash, retries max count is assumed to be at hash[:max]
- when it is an integer, this is the max count (as before)
```
  d71a7797
- Merge branch 'copy-changes-for-abuse-clarity' into 'master' · e7df959b
  Phil Hughes authored Nov 07, 2018
```
Copy changes for abuse clarity

Closes #51589

See merge request gitlab-org/gitlab-ce!22148
```
  e7df959b
- Copy changes for abuse clarity · 28840d3f
  Jeremy Watson authored Nov 07, 2018
  
  28840d3f
- Merge branch 'ee-1012-assign-code-owner-as-approver' into 'master' · 4a5d04fb
  Grzegorz Bizon authored Nov 07, 2018
```
(EE Port) Assign approvers based on code owners

See merge request gitlab-org/gitlab-ce!22513
```
  4a5d04fb
- Merge branch 'docs/fix-openshift-links' into 'master' · 3cf13f2f
  Achilleas Pipinellis authored Nov 07, 2018
```
Fix broken link to Vagrant box

See merge request gitlab-org/gitlab-ce!22859
```
  3cf13f2f
- Merge branch '21480-parallel-job-keyword-mvc' into 'master' · 6f6cd4f4
  Grzegorz Bizon authored Nov 07, 2018
```
Resolve "`parallel` job keyword MVC"

Closes #21480

See merge request gitlab-org/gitlab-ce!22631
```
  6f6cd4f4
- Merge branch 'winh-delayed-jobs-dynamic-timer' into 'master' · b1fae097
  Filipa Lacerda authored Nov 07, 2018
```
Add dynamic timer to delayed jobs

See merge request gitlab-org/gitlab-ce!22382
```
  b1fae097
- Merge branch 'docs/fix-links-to-product-features' into 'master' · cb72c3ca
  Achilleas Pipinellis authored Nov 07, 2018
```
Fix links to product features

See merge request gitlab-org/gitlab-ce!22860
```
  cb72c3ca
- Merge branch 'gl-ui-loading-icon' into 'master' · 5ed8e707
  Filipa Lacerda authored Nov 07, 2018
```
Remove gitlab-ui loading icon from global

See merge request gitlab-org/gitlab-ce!22724
```
  5ed8e707
- Remove gitlab-ui loading icon from global · c4aa33fc
  Clement Ho authored Nov 07, 2018
  
  c4aa33fc
- Merge branch 'mr-image-commenting' into 'master' · e1e315ee
  Filipa Lacerda authored Nov 07, 2018
```
Re-implemented image commenting on diffs

Closes #48956

See merge request gitlab-org/gitlab-ce!22443
```
  e1e315ee
- Merge branch... · 54ba4fdb
  Dmitriy Zaporozhets authored Nov 07, 2018
```
Merge branch '52771-ldap-users-can-t-choose-private-or-internal-when-creating-a-new-group' into 'master'

Fix new group visibility form for non-admins

Closes #52771

See merge request gitlab-org/gitlab-ce!22468
```
  54ba4fdb
- Revert jobs/components/job_container_item.vue from v-gl-tooltip to v-tooltip directive · a6701d46
  Winnie Hellmann authored Nov 07, 2018
  
  a6701d46
- Run yarn prettier-all-save · b678e07e
  Winnie Hellmann authored Nov 02, 2018
  
  b678e07e
- Add changelog for dynamic timers of delayed jobs · 7b846c67
  Winnie Hellmann authored Oct 26, 2018
  
  7b846c67
- Add dynamic timer for delayed jobs in job sidebar · 997d70ea
  Winnie Hellmann authored Oct 30, 2018
  
  997d70ea
- Add dynamic timer for delayed jobs in pipeline graph · 53a28e80
  Winnie Hellmann authored Oct 26, 2018
  
  53a28e80
- Add dynamic timer for delayed jobs on single job page · ff72bba1
  Winnie Hellmann authored Oct 26, 2018
  
  ff72bba1
- Add Vue mixin for delayed job timers · 74f22d26
  Winnie Hellmann authored Oct 26, 2018
  
  74f22d26
- Add placeholder for remaining time in delayed job tooltips · 390abbf0
  Winnie Hellmann authored Oct 26, 2018
  
  390abbf0
- Fixed user avatar link render empty space · 0485c047
  Phil Hughes authored Nov 07, 2018
  
  0485c047
- Merge branch 'ce-7472-epics-autocomplete' into 'master' · c81d4a65
  Grzegorz Bizon authored Nov 07, 2018
```
CE port: Remove instance autocomplete_service variable

See merge request gitlab-org/gitlab-ce!22847
```
  c81d4a65
- Merge branch 'patch-31' into 'master' · c9911621
  Grzegorz Bizon authored Nov 07, 2018
```
Update issue_workflow.md: team labels

See merge request gitlab-org/gitlab-ce!22800
```
  c9911621
- Merge branch 'master' into 'master' · 288d6ae9
  Achilleas Pipinellis authored Nov 07, 2018
```
CI/CD coverage docs: fix pytest-cov regex

Closes #48613

See merge request gitlab-org/gitlab-ce!22842
```
  288d6ae9
- Merge branch 'fj-50890-fix-commit-message-wiki-new-page' into 'master' · 7d2673b4
  Sean McGivern authored Nov 07, 2018
```
Fix bug with wiki page create message

Closes #50890

See merge request gitlab-org/gitlab-ce!22849
```
  7d2673b4
- Fix bug with wiki page create message · 8aae7405
  Francisco Javier López authored Nov 07, 2018
  
  8aae7405
- Merge branch 'sh-fix-issue-52649' into 'master' · 1b788c66
  Sean McGivern authored Nov 07, 2018
```
Fix statement timeouts in RemoveRestrictedTodos migration

Closes #52649

See merge request gitlab-org/gitlab-ce!22795
```
  1b788c66
- Merge branch 'gt-use-merge-request-prefix-in-event-feed-title' into 'master' · 6da11809
  Sean McGivern authored Nov 07, 2018
```
Use merge request prefix symbol in event feed title

Closes #36267

See merge request gitlab-org/gitlab-ce!22449
```
  6da11809
- Merge branch '4459-redirect-users-back-to-secondary-after-logout-login' into 'master' · 68cb1e23
  Stan Hu authored Nov 07, 2018
```
Add a helper method to append path to a base URL

See merge request gitlab-org/gitlab-ce!22854
```
  68cb1e23
- Reschedule another instance of RemoveRestrictedTodos migration · bb55bcdd
  Stan Hu authored Nov 06, 2018
  
  bb55bcdd
- Merge branch 'patch-31' into 'master' · 4068d460
  Evan Read authored Nov 07, 2018
```
Little typo in markdown.md

See merge request gitlab-org/gitlab-ce!22851
```
  4068d460
- Add a helper method to append path to a base URL · 5c519d11
  Douglas Barbosa Alexandre authored Nov 06, 2018
```
In Ruby 2.4, `URI.join("http://test//", "a").to_s` will
remove the double slash, however it's not the case in
Ruby 2.5. Using chomp should work better for the intention,
as we're not trying to allow things like ../ or / paths
resolution.

This helper method append path to host, making sure
there's one single slash as path separator.
```
  5c519d11