89431a9f96
Add troubleshooting steps for "local issuer certificate" error
2019-02-15 11:30:54 +00:00
88c3358be2
Merge branch '9251-skip_whitelisted_vulnerabilities-ce' into 'master'
...
Backport fixtures update for Container Scanning
See merge request gitlab-org/gitlab-ce!25183
2019-02-15 11:25:34 +00:00
76dec70015
Backport fixture update
...
Sync fixture with EE.
2019-02-15 11:25:34 +00:00
83a760c592
Merge branch '56937-edit-knative-domain-after-it-has-been-deployed' into 'master'
...
Guarantee functions are not lost after Knative update
See merge request gitlab-org/gitlab-ce!25067
2019-02-15 11:16:46 +00:00
ed2f7e23d6
Rename scope to imply :installed and :updated result
...
- Adds to specs the case where apps are also updated
- Rename scope calls on Gitlab::UsageData and Clusters::Cluster
- Removes a duplicated spec
2019-02-15 11:16:45 +00:00
0b966fb0d9
Merge branch '57671-fix_merge_request_base_pipeline' into 'master'
...
Base pipeline must be from target branch
Closes #57671
See merge request gitlab-org/gitlab-ce!25226
2019-02-15 10:47:13 +00:00
b079a6b6bb
Base pipeline must be from target branch
2019-02-15 10:47:13 +00:00
ecb1411fbb
Merge branch 'sh-example-policy-debugging-docs' into 'master'
...
Document how to debug declarative policies
See merge request gitlab-org/gitlab-ce!25234
2019-02-15 10:44:52 +00:00
3f55633a2b
Merge branch 'jl-update-ff-process-docs' into 'master'
...
Add guidance for the initial state of a feature flag
See merge request gitlab-org/gitlab-ce!24829
2019-02-15 09:51:14 +00:00
5531d0ee6a
Merge branch 'docs/refactor-api-landing-page' into 'master'
...
Refactor of API landing page
See merge request gitlab-org/gitlab-ce!25076
2019-02-15 09:39:23 +00:00
fb6e59ebe3
Refactor of API landing page
...
- Breaks up into more sections.
- Also minor fixes to pages within sections.
2019-02-15 09:39:23 +00:00
2a5de7e0ee
Merge branch '36263-the-award-emoji-api-has-an-incorrect-description-of-the-id-parameter' into 'master'
...
Clarify IDs in the award emoji API
Closes #36263
See merge request gitlab-org/gitlab-ce!25215
2019-02-15 09:11:33 +00:00
0328d4faee
Merge branch '56485-implement-graphql-mergerequestsresolver' into 'master'
...
Resolve "Implement GraphQL MergeRequestsResolver"
Closes #56485
See merge request gitlab-org/gitlab-ce!24805
2019-02-15 08:47:10 +00:00
b95cf314ed
Merge branch 'ce-1979-fe-multiple-approval-rules' into 'master'
...
CE Port of Multiple merge request approval rules
See merge request gitlab-org/gitlab-ce!25193
2019-02-15 08:40:30 +00:00
4b50e4d5ed
Merge branch '57692-fix-rendering-of-none-any' into 'master'
...
Resolve "Search bar rendering `none` and `any` as users"
Closes #57692
See merge request gitlab-org/gitlab-ce!25235
2019-02-15 08:34:24 +00:00
2eecd27835
Document how to debug declarative policies
...
This helped me troubleshoot
https://gitlab.com/gitlab-org/gitlab-ee/issues/9727#note_141202527 .
2019-02-14 22:49:49 -08:00
85189ef715
Fix grammar in feature flags section, add link to docs
2019-02-14 22:33:46 -05:00
d9328cb3e3
Merge branch '49502-gpg-signature-api-endpoint' into 'master'
...
Provide an API endpoint to get the GPG signature of a commit
Closes #49502
See merge request gitlab-org/gitlab-ce!25032
2019-02-15 01:59:39 +00:00
a092b5ae45
Merge branch 'sh-fix-board-user-assigns' into 'master'
...
Fix 403 errors when adding an assignee list in project boards
Closes gitlab-ee#9727
See merge request gitlab-org/gitlab-ce!25263
2019-02-14 22:44:35 +00:00
b2da8042b4
Fix 403 errors when adding an assignee list in project boards
...
Due to a bug in `BoardPolicy`, users were getting back a 403 error when
trying to assign users to an assignee list and seeing "Something went
wrong while fetching assignees list". For some reason, the declarative
policy runtime was ignoring the ternary condition.
To work around the issue, we make the project board an explicit
condition check.
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9727
2019-02-14 13:41:43 -08:00
e2a56bd1ae
Merge branch 'qa-ml-check-server-in-before-hook' into 'master'
...
[QA-CE] Move server responding check to scenario before hook
See merge request gitlab-org/gitlab-ce!25257
2019-02-14 21:23:55 +00:00
701303a5db
Merge branch 'ac-secpick-template' into 'master'
...
Select Security Release template with secpick
See merge request gitlab-org/gitlab-ce!25246
2019-02-14 19:15:49 +00:00
12058fbeb8
Merge branch 'filter-note-parameters' into 'master'
...
Include additional fields in the Rails filter_parameters configuration
See merge request gitlab-org/gitlab-ce!25238
2019-02-14 18:33:36 +00:00
62c6b062e2
Merge branch 'inline-web-worker-cors' into 'master'
...
Fixed web workers not working locally in rspec
Closes #57169
See merge request gitlab-org/gitlab-ce!25194
2019-02-14 18:30:04 +00:00
b9f1dec373
Merge branch 'web-ide-commit-header-icon-alignment-fix' into 'master'
...
Fixes alignment of changed icon in Web IDE
Closes #57649
See merge request gitlab-org/gitlab-ce!25202
2019-02-14 18:24:50 +00:00
e842df6054
Merge branch 'fix-metrics-reload' into 'master'
...
Explicitly handle class constant references
See merge request gitlab-org/gitlab-ce!25102
2019-02-14 18:05:35 +00:00
e6fcdd7aca
Update Metrics references to Object path
...
On reload, references to Metrics within classes in the Gitlab::Metrics
module fail. Update all references to ::Gitlab::Metrics so that
constant lookup finds the right module in development. This fix should
not impact production.
2019-02-14 18:05:35 +00:00
4818211a3a
Merge branch 'tz-stylelint' into 'master'
...
Added Stylelint Setup
See merge request gitlab-org/gitlab-ce!25148
2019-02-14 17:37:56 +00:00
e5e57df61c
Move server responding check to scenario before hook
...
This checks that the server is responding before any other actions,
including before trying to add a license.
2019-02-14 12:06:39 -05:00
1e5c83f2c8
Merge branch 'improve-error-tracking-docs' into 'master'
...
Update docs with permissions required for error tracking
See merge request gitlab-org/gitlab-ce!25208
2019-02-14 17:05:35 +00:00
ed65aebe24
Add line to doc listing reqd Sentry token scopes
...
Add a line to say that event:read and project:read are required.
project:read is not strictly required right now, but will be when
the project dropdown is released next month.
2019-02-14 17:05:35 +00:00
bbd0a2ce91
Merge branch 'make-danger-ask-for-backend-review-for-.gitlab-ci.yml' into 'master'
...
Make Danger as for backend review for .gitlab-ci.yml
See merge request gitlab-org/gitlab-ce!25251
2019-02-14 16:39:24 +00:00
1de3f631c4
Merge branch 'do-not-retry-jobs-in-quarantine' into 'master'
...
Do not retry jobs in quarantine since they are supposed to fail
See merge request gitlab-org/gitlab-ce!25248
2019-02-14 16:33:59 +00:00
2b7e30552a
Merge branch '44740-api-to-verify-a-given-user-has-right-to-merge-a-given-mergerequest' into 'master'
...
API: Expose if the user can merge a given merge request
Closes #44740
See merge request gitlab-org/gitlab-ce!25207
2019-02-14 16:32:44 +00:00
cd6af77f95
API: Expose if the user can merge a given merge request
2019-02-14 16:32:44 +00:00
6d1273cf2a
Merge branch 'simplify-secpick-git-commands' into 'master'
...
Simplify bin/secpick git commands
See merge request gitlab-org/gitlab-ce!25240
2019-02-14 16:29:31 +00:00
482b91d519
Merge branch 'reduce-diff-with-ee-in-app-services' into 'master'
...
Reduce remaining diff with EE in app/services
See merge request gitlab-org/gitlab-ce!24968
2019-02-14 16:26:21 +00:00
d4b973fd51
Merge branch 'syntax-highlighting-again' into 'master'
...
Fix suggested changes syntax highlighting
See merge request gitlab-org/gitlab-ce!25116
2019-02-14 16:01:47 +00:00
f9303eec3e
Add fix for suggested changes syntax highlighting
...
Removed the `note-text` class since it conflicted other classes.
2019-02-14 16:01:47 +00:00
750e3c6704
Merge branch 'dz-grou-labels-specs' into 'master'
...
Add more feature specs for group labels
Closes #25381
See merge request gitlab-org/gitlab-ce!25244
2019-02-14 15:52:53 +00:00
e3b79499f5
Make Danger as for backend review for .gitlab-ci.yml
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-02-14 16:49:29 +01:00
f7bd3bdbf3
Add more feature specs for group labels
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2019-02-14 17:09:11 +02:00
f80f6bbcdc
Use a block and move setup to example directly
2019-02-14 22:57:34 +08:00
c735bfaa53
Do not retry jobs in quarantine since they are supposed to fail
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-02-14 15:19:11 +01:00
3f100ee9ce
Select Security Release template with secpick
2019-02-14 15:11:51 +01:00
1fc89ca945
Merge branch 'if-24642-activity_service_optimization' into 'master'
...
Optimize Redis usage in User::ActivityService
See merge request gitlab-org/gitlab-ce!25005
2019-02-14 14:07:24 +00:00
0b53566111
Added Stylelint Setup
...
Added stylelint to static-analysis
Updated yarn dependencies
CSS Fixes and rule adoptions of stylelint
Added stylelint-scss
Deduplicated yarn.lock to clear dependencies
2019-02-14 14:40:50 +01:00
eafe834c3d
Reduce remaining diff with EE in app/services
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-02-14 12:37:55 +01:00
241f0110ca
Fixed web workers not working locally in rspec
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57169
2019-02-14 11:33:35 +00:00
ed7144ad58
Merge branch '56694-mark-group-level-labels-in-label-api-as-such' into 'master'
...
Mark group-level labels in Label API as such.
Closes #56694
See merge request gitlab-org/gitlab-ce!25219
2019-02-14 10:48:12 +00:00
DeAndre Harris
Kamil Trzciński
Olivier Gonzalez
João Cunha
Grzegorz Bizon
Marcia Ramos
Marin Jankovski
Achilleas Pipinellis
Evan Read
James Lopez
Phil Hughes
Stan Hu
Joshua Lambert
Douwe Maan
Douglas Barbosa Alexandre
Mark Lapierre
Robert Speicher
Filipa Lacerda
Sarah Yasonik
Annabel Dunstone Gray
Reuben Pereira
Nick Thomas
Lin Jen-Shin
Robert Schilling
Rémy Coutable
Dmitriy Zaporozhets
Alessio Caiazza
Tim Zallmann