5fef9bd9f0
Merge branch 'id-skip-setting-repo-refs' into 'master'
...
Skip set_repo_refs to speed up the tests
See merge request gitlab-org/gitlab-ce!32556
2019-09-03 09:15:48 +00:00
b7f4a7077f
Skip set_repo_refs to speed up the tests
2019-09-03 09:15:47 +00:00
fb51de2e49
Introduce a new 'package-and-qa-manual:master' job
...
This is needed because in `master`, the `gitlab:assets:compile` is
created, but not the `gitlab:assets:compile pull-cache` job, and the
`needs` keyword cannot take jobs that don't exist, thus we have to
create a dedicated job for `master`, with `needs: ["build-qa-image",
"gitlab:assets:compile"]` instead of `needs: ["build-qa-image",
"gitlab:assets:compile pull-cache"]`.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-09-03 11:07:27 +02:00
a86aa988ab
Merge branch '36765-flash-notification' into 'master'
...
Make error flash notification sticky
See merge request gitlab-org/gitlab-ce!30141
2019-09-03 09:03:38 +00:00
3741402a24
Make flash notifications sticky
...
This commit also unifies layout structure
and remove no_container flag
2019-09-03 09:03:35 +00:00
876ae19d9e
Creates utils for the job log
...
With the new job log json format
we need a parser on the frontend
2019-09-03 09:32:42 +01:00
cea72e9042
Quarantine flaky dashboard_spec.js
2019-09-03 08:23:04 +00:00
a22646af74
Ensure 'build-qa-image' is created for all pipelines except docs & qa
...
This also makes 'package-and-qa-manual' created for 'master' because
it's a valid use-case to run manual QA on 'master'.
Without this change, no pipeline could be created for auto-deploy
branches due to the following error:
The form contains the following error:
package-and-qa-manual: needs 'build-qa-image'
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-09-03 09:22:12 +02:00
af5f2424ca
Merge branch 'change-role-system-hook' into 'master'
...
Add system hooks for project/group membership updates
Closes gitlab-ee#12252
See merge request gitlab-org/gitlab-ce!32371
2019-09-03 07:08:40 +00:00
abd9e84272
Merge branch 'ce-12996-cancel-redundant-pipelines' into 'master'
...
Backport retries options for cancel_running
See merge request gitlab-org/gitlab-ce!32525
2019-09-03 06:31:58 +00:00
8c21610c79
Add pipeline.type key to PipelineEntity
...
This commit adds pipeline.type key to PipelineEntity.
This key will be used in MR widget in the next iteration.
2019-09-03 13:30:53 +07:00
991143eb1f
Merge branch 'bump-reliable-fetcher' into 'master'
...
Bump reliable fetcher
See merge request gitlab-org/gitlab-ce!32565
2019-09-03 06:20:37 +00:00
e1aab74f07
Merge branch 'id-project-for-in-tests' into 'master'
...
Stub DetectRepositoryLanguagesWorker for all tests
See merge request gitlab-org/gitlab-ce!32430
2019-09-03 06:19:22 +00:00
8dcddb9886
Stub DetectRepositoryLanguagesWorker for all tests
...
It performs an expensive operation, but isn't required in
most of tests
2019-09-03 06:19:21 +00:00
ab27d66a7f
Merge branch '51372-remove-milestone-tabs-deprecation-message' into 'master'
...
Remove deprecation message for milestone tabs
See merge request gitlab-org/gitlab-ce!32252
2019-09-03 05:55:51 +00:00
898350e30b
Bump reliable fetcher
2019-09-03 08:02:58 +03:00
594f56e1ef
Merge branch 'an-use-labkit-correlation-id' into 'master'
...
Remove all references to Gitlab::CorrelationId
See merge request gitlab-org/gitlab-ce!32228
2019-09-03 04:43:46 +00:00
ab60775216
Add not null constraints to prometheus_metrics table columns
2019-09-02 23:41:19 -05:00
7d90f0f060
Use new location for helm charts repo
...
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2019-09-03 10:06:02 +05:30
4e4fcf79c5
Merge branch '40096-allow-ci-token-to-delete-from-registry' into 'master'
...
If user can push to docker then it can delete too
Closes #40096
See merge request gitlab-org/gitlab-ce!31796
2019-09-03 02:41:23 +00:00
f5b2899422
If user can push to docker then it can delete too
...
Extends the permission of $CI_REGISTRY_USER to allow them
to delete tags in addition to just pushing.
https://gitlab.com/gitlab-org/gitlab-ce/issues/40096
2019-09-03 02:41:22 +00:00
2f210e9c3f
Remove deprecation message for milestone tabs
...
We're reversing the deprecation due to user feedback
2019-09-03 09:17:23 +08:00
3feab2348f
Merge branch 'docs-quick-actions-followup-2' into 'master'
...
Make badging less confusing in quick actions doc
Closes #66886
See merge request gitlab-org/gitlab-ce!32515
2019-09-03 00:47:26 +00:00
63c888f6be
Make badging less confusing in quick actions doc
2019-09-03 00:47:25 +00:00
2f0d2fa068
Merge branch 'docs-using-docker-build-1' into 'master'
...
Add suggested changes to docker build doc
Closes #66802
See merge request gitlab-org/gitlab-ce!32442
2019-09-03 00:43:28 +00:00
42805130ae
Add suggested changes to docker build doc
2019-09-03 00:43:28 +00:00
2fe3f21908
Merge branch '58192-add-danger-bot-development-docs' into 'master'
...
Add Danger bot development documentation
Closes #58192
See merge request gitlab-org/gitlab-ce!32506
2019-09-03 00:23:52 +00:00
fda560bdb4
Add Danger bot development documentation
...
This is overdue, and some of the suggestions are embarrassing, but
this is how we actually develop Danger today.
2019-09-03 00:23:52 +00:00
2bd4d580d1
Add system hooks for project/group membership updates
...
When updating group and project members, new system hooks
`user_update_for_group` and `user_update_for_team` will be executed.
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/12252
2019-09-02 18:35:36 -05:00
1894c6ebe8
Add facade which will always return nil in CE
...
This method will be overridden in EE
2019-09-03 11:29:57 +12:00
407132bfd4
Merge branch '66393-proposal-remove-area-chart-in-favor-of-time-series' into 'master'
...
Remove area chart in favor of time series
Closes #66393
See merge request gitlab-org/gitlab-ce!32129
2019-09-02 20:04:02 +00:00
e6fb109d45
Merge branch 'cluster-form-ca-cert-larger' into 'master'
...
Expand textarea for CA cert in cluster form
See merge request gitlab-org/gitlab-ce!32508
2019-09-02 19:57:53 +00:00
138d886d0d
Merge branch 'add-notification-reason-to-note-emails' into 'master'
...
Add X-GitLab-NotificationReason header to note emails
See merge request gitlab-org/gitlab-ce!32422
2019-09-02 18:41:57 +00:00
1b81a81b95
Remove Users.support_bot column
...
This column is not present in `db/schema.rb` and hence needs to be
removed conditionally.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/66901 for background
2019-09-02 20:22:20 +02:00
183d9ed708
Merge branch 'qa-add-built-in-project-template-test-ce' into 'master'
...
Backport EE changes for built-in project template test
See merge request gitlab-org/gitlab-ce!32358
2019-09-02 18:20:07 +00:00
8373ced9e6
Merge branch 'pl-project-service-filename-lineo' into 'master'
...
Provide filename and line number for `class_eval`
See merge request gitlab-org/gitlab-ce!32500
2019-09-02 18:05:33 +00:00
e0ce29ad06
Provide filename and line number for `class_eval`
...
This commit removes one RuboCop offense from its todo file.
2019-09-02 18:05:33 +00:00
075f6d3559
Add X-GitLab-NotificationReason header to note emails
...
The 'assigned' reason doesn't apply to notes, but the other two
can ('mentioned' and 'own_activity'), so we can still use this for note
emails.
2019-09-02 12:15:24 -05:00
d3076322f2
Merge branch 'patch-74' into 'master'
...
Docs: Clarify config value true is a string
See merge request gitlab-org/gitlab-ce!32209
2019-09-02 17:07:37 +00:00
554f419273
Update `true` with `"true"`
...
Gitlab CI Linter otherwise gives error `variables config should be a hash value of key value pairs`
2019-09-02 17:07:36 +00:00
62b001451b
Merge branch 'sh-suppress-diverging-count-commits-request' into 'master'
...
Skip requesting diverging commit counts if no branches are listed
See merge request gitlab-org/gitlab-ce!32496
2019-09-02 16:50:10 +00:00
526ea7c5b6
Update Mermaid to v8.2.6
...
This fixes a regression where an underscore in labels no
longer worked:
https://github.com/knsv/mermaid/releases
2019-09-02 16:50:09 +00:00
fb63a00ea4
Merge branch 'use-only-ref-in-the-code-quality-job-template' into 'master'
...
Update Code-Quality.gitlab-ci.yml to use `only.refs`
See merge request gitlab-org/gitlab-ce!32394
2019-09-02 16:36:59 +00:00
1d3d127648
Merge branch 'use-atlassian-jwt-gem-ce' into 'master'
...
[CE] Use atlassian-jwt-ruby gem
See merge request gitlab-org/gitlab-ce!32519
2019-09-02 16:13:11 +00:00
b663a872d9
Update Code-Quality.gitlab-ci.yml to use `only.refs`
...
This allows overriding `only.refs` to something else if needed.
2019-09-02 12:19:15 -03:00
f4e40c532b
Merge branch 'ab-admin-page-user-active-count' into 'master'
...
Replace indexes for counting active users
See merge request gitlab-org/gitlab-ce!32538
2019-09-02 14:53:51 +00:00
aaf243e7f9
Merge branch 'ab-admin-page-user-active-count' into 'master'
...
Replace indexes for counting active users
See merge request gitlab-org/gitlab-ce!32538
2019-09-02 14:52:43 +00:00
6cfab760b7
Merge branch '66791-handle-different-listen-address-formats' into 'master'
...
Handle :9090 and 0.0.0.0:9090 listen_address formats
See merge request gitlab-org/gitlab-ce!32456
2019-09-02 14:35:03 +00:00
414523b0bf
Handle :9090 and 0.0.0.0:9090 listen_address formats
...
Prometheus listen_address can be in formats of :9090 and 0.0.0.0:9090.
But before these can be used to connect a project to Prometheus, they
have to converted into absolute URIs.
2019-09-02 14:35:02 +00:00
2d3dc05fb9
Update CHANGELOG.md for 12.2.4
...
[ci skip]
2019-09-02 14:28:55 +00:00
Lin Jen-Shin
Igor
Rémy Coutable
Kushal Pandya
Fatih Acet
Filipa Lacerda
Winnie Hellmann
Shinya Maeda
Stan Hu
Valery Sizov
Ash McKenzie
Arun Kumar Mohan
Balasankar "Balu" C
Thong Kuah
Giorgenes Gelatti
Heinrich Lee Yu
Evan Read
Marcel Amirault
Nick Thomas
Brandon Williams
Tim Zallmann
Mayra Cabrera
Andreas Brandl
Walmyr Lima e Silva Filho
Peter Leitzen
Sean McGivern
Achilleas Pipinellis
yonatan miller
Douglas Barbosa Alexandre
Reuben Pereira
GitLab Release Tools Bot