delta/gitlab/gitlab-ce.git/spec, branch docs-css gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'sh-fix-project-branches-merge-status' into 'master' 2019-04-01T10:25:31+00:00 Douwe Maan douwe@gitlab.com 2019-04-01T10:25:31+00:00 2db4e79f2825408f99e4f070bc3393de9b4cace3 Fix API /project/:id/branches not returning correct merge status Closes #56250 See merge request gitlab-org/gitlab-ce!26785 
Fix API /project/:id/branches not returning correct merge status

Closes #56250

See merge request gitlab-org/gitlab-ce!26785
 add a uniq constraints on issues and mrs labels 2019-04-01T09:09:49+00:00 Antoine Huret huret.antoine@yahoo.fr 2019-04-01T09:09:49+00:00 5e10b611299b4a968e51f5a706d60b7d1a9c29b5 






Merge branch '6539-extract-ee-specific-code' into 'master'
2019-04-01T08:58:16+00:00

Rémy Coutable
remy@rymai.me

2019-04-01T08:58:16+00:00

e5aa2d88248b510b55c909d2ba4ee7b511927c86

Add no-op license helper to CE

See merge request gitlab-org/gitlab-ce!26723




Add no-op license helper to CE

See merge request gitlab-org/gitlab-ce!26723






Don't try to set any ACL on uploaded objects
2019-03-30T13:55:33+00:00

Bastian Blank
waldi@debian.org

2019-03-29T22:54:44+00:00

b82ccf2cbc074e36c78dd1e331c6745cb9b71349

Set ACL of uploaded objects to not-public (fog-aws) or no ACL at all
(fog-google).  Value is ignored by other supported backends (fog-aliyun,
fog-openstack, fog-rackspace)

This allows uploads to GCS with ACL support disabled.





Set ACL of uploaded objects to not-public (fog-aws) or no ACL at all
(fog-google).  Value is ignored by other supported backends (fog-aliyun,
fog-openstack, fog-rackspace)

This allows uploads to GCS with ACL support disabled.







Revise merged branch check to green light up to N branches
2019-03-30T12:28:37+00:00

Stan Hu
stanhu@gmail.com

2019-03-30T12:28:37+00:00

2675581cb9dbc37c81732ac69e2166da6ced0429

The main point of this check is to ensure we aren't checking
all branches, not that we have an exact count.





The main point of this check is to ensure we aren't checking
all branches, not that we have an exact count.







Fix API /project/:id/branches not returning correct merge status
2019-03-30T12:20:29+00:00

Stan Hu
stanhu@gmail.com

2019-03-29T22:16:31+00:00

cedbb3366bf3dd9bafe95dde366c1e28ee70c615

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24034 introduced
a regression where only the first 20 branches were used to determine
whether a branch has been merged because the pagination was applied
incorrectly. Requesting the second page of branches via the API would
always have the wrong merge status. We fix this by properly paginating
the branches before requesting their merge status.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56250





https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24034 introduced
a regression where only the first 20 branches were used to determine
whether a branch has been merged because the pagination was applied
incorrectly. Requesting the second page of branches via the API would
always have the wrong merge status. We fix this by properly paginating
the branches before requesting their merge status.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56250







Merge branch 'sh-fix-failing-spec-on-first-da' into 'master'
2019-03-30T06:42:46+00:00

James Lopez
james@gitlab.com

2019-03-30T06:42:46+00:00

50a1e01fa8959b08df8bfc18940f9310876873b3

Fix failing spec in spec/features/users/login_spec.rb

Closes #59731

See merge request gitlab-org/gitlab-ce!26787




Fix failing spec in spec/features/users/login_spec.rb

Closes #59731

See merge request gitlab-org/gitlab-ce!26787






Fix failing spec in spec/features/users/login_spec.rb
2019-03-30T04:05:37+00:00

Stan Hu
stanhu@gmail.com

2019-03-30T03:57:45+00:00

bf286d1172430051cf12ad2e1bbe27c063b7d74d

This spec would start to fail on the first of the month because the
generated text would have a zero-padded day (e.g. 01 vs 1), whereas the
expected text check used an unpadded day via the `-d` parameter in
strftime (https://apidock.com/ruby/Date/strftime). To fix this, we
use use the `d` parameter to pad zeros.

This spec was introduced recently in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25731.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59731





This spec would start to fail on the first of the month because the
generated text would have a zero-padded day (e.g. 01 vs 1), whereas the
expected text check used an unpadded day via the `-d` parameter in
strftime (https://apidock.com/ruby/Date/strftime). To fix this, we
use use the `d` parameter to pad zeros.

This spec was introduced recently in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25731.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59731







Renames Cluster#managed? to provided_by_user?
2019-03-29T18:23:18+00:00

Mayra Cabrera
mcabrera@gitlab.com

2019-03-29T18:23:18+00:00

ab06d1eda2fa222b4de400d2b18eab611ffefa68

This will allow to user the term managed? on
https://gitlab.com/gitlab-org/gitlab-ce/issues/56557. Managed? will be
used to distinct clusters that are automatically managed by GitLab





This will allow to user the term managed? on
https://gitlab.com/gitlab-org/gitlab-ce/issues/56557. Managed? will be
used to distinct clusters that are automatically managed by GitLab







Merge branch 'winh-jest-html-fixtures' into 'master'
2019-03-29T16:59:16+00:00

Clement Ho
clemmakesapps@gmail.com

2019-03-29T16:59:16+00:00

b4cc639f80407285e69bdb5cb2bda7dcd74c87e6

Add helpers for HTML fixtures to Jest

Closes #57998

See merge request gitlab-org/gitlab-ce!26739




Add helpers for HTML fixtures to Jest

Closes #57998

See merge request gitlab-org/gitlab-ce!26739