6c83c2d8b9
Merge branch 'lock-trace-writes' into 'master'
...
Lock writes to trace stream
Closes #51502
See merge request gitlab-org/gitlab-ce!23332
2018-11-27 20:56:40 +00:00
1524a19302
Merge branch '53763-fix-encrypt-columns-data-loss' into 'master'
...
Correctly handle data-loss scenarios when encrypting columns
Closes #53763
See merge request gitlab-org/gitlab-ce!23306
2018-11-27 19:08:53 +00:00
6ddefe7cad
Correctly handle data-loss scenarios when encrypting columns
...
If the EncryptColumns background migration runs in a sidekiq with a
stale view of the database schema, or when the purported destination
columns don't actually exist, data loss can result. Attempt to work
around these issues by reloading schema information before running
the migration, and raising errors if the model reports that any of its
source or destination columns are missing.
2018-11-27 18:24:18 +00:00
c88cea8191
Merge branch '52276-jump-to-top-in-merge-request' into 'master'
...
Resolve "Jump to top in merge request"
Closes #52276
See merge request gitlab-org/gitlab-ce!23069
2018-11-27 18:05:16 +00:00
153dddefed
Resolve "Jump to top in merge request"
2018-11-27 18:05:16 +00:00
a99f342b42
Merge branch 'issuable-suggestions' into 'master'
...
Suggest issues when typing title
Closes #22071
See merge request gitlab-org/gitlab-ce!22866
2018-11-27 17:58:27 +00:00
d0b529d17a
Merge branch 'dz-fix-new-project-error-message' into 'master'
...
Fix top padding for new project form when error message is present
See merge request gitlab-org/gitlab-ce!23384
2018-11-27 17:38:57 +00:00
0afce35d65
Merge branch '53874-overlap-separator-navbar' into 'master'
...
Resolve "Fix overlapping separator on the mobile navigation bar"
Closes #53874
See merge request gitlab-org/gitlab-ce!23126
2018-11-27 17:04:11 +00:00
a7a6f80c34
Resolve "Fix overlapping separator on the mobile navigation bar"
2018-11-27 17:04:11 +00:00
31a1ce2132
Lock writes to trace stream
2018-11-27 17:55:20 +01:00
681d7139a9
Merge branch 'json-logging-for-k8s' into 'master'
...
Json logging for k8s Integration
See merge request gitlab-org/gitlab-ce!23328
2018-11-27 16:51:34 +00:00
17acf40dc9
Merge branch '53248-docs-update-integrate-your-server-with-github-docs' into 'master'
...
Update GitHub integration docs to mainly follow GitHub updates.
Closes #53248
See merge request gitlab-org/gitlab-ce!22643
2018-11-27 16:46:02 +00:00
8a6c2c97df
Merge branch 'docs/skip-auto-reconfigure' into 'master'
...
Replace deprecated skip-auto-migrations occurrence
Closes #45031
See merge request gitlab-org/gitlab-ce!23326
2018-11-27 16:35:19 +00:00
e7baa35e23
Merge branch 'docs/pages-infra-issue' into 'master'
...
Add link to infra issue about Pages access control
Closes #54269
See merge request gitlab-org/gitlab-ce!23352
2018-11-27 16:33:32 +00:00
8f1355b782
Fix top padding for new project form when error message is present
2018-11-27 15:37:15 +00:00
50e21a89a0
Suggests issues when typing title
...
This suggests possibly related issues when the user types a title.
This uses GraphQL to allow the frontend to request the exact
data that is requires. We also get free caching through the Vue Apollo
plugin.
With this we can include the ability to import .graphql files in JS
and Vue files.
Also we now have the Vue test utils library to make testing
Vue components easier.
Closes #22071
2018-11-27 15:10:40 +00:00
1cd570cf77
Merge branch 'fix/gb/update-mrs-troubleshooting-page-link' into 'master'
...
Update merge requests troubleshooting docs link
See merge request gitlab-org/gitlab-ce!23344
2018-11-27 15:05:47 +00:00
d359f01f33
Merge branch 'leipert-fix-unsecure-npm-deps' into 'master'
...
Fix unsecure node dependencies
See merge request gitlab-org/gitlab-ce!23378
2018-11-27 14:49:19 +00:00
f0a9626e10
Fix unsecure node dependencies
2018-11-27 14:49:19 +00:00
e18e38f10f
Merge branch 'diff-header-styling-fixes' into 'master'
...
Fixed UI bugs with sticky diff header
Closes #54503
See merge request gitlab-org/gitlab-ce!23374
2018-11-27 14:44:47 +00:00
7e7fb6deba
Use JSON logging for helm install services
2018-11-27 15:23:02 +01:00
c20537a3c5
Update merge requests troubleshooting docs link
2018-11-27 14:24:19 +01:00
d933731ae9
Merge branch 'docs/fix-some-grammar' into 'master'
...
Fix minor grammar issues
See merge request gitlab-org/gitlab-ce!23372
2018-11-27 13:19:44 +00:00
fcca3f6452
Merge branch '51792-dont-delete-failed-install-pods' into 'master'
...
Don't remove failed install pods
Closes #51792
See merge request gitlab-org/gitlab-ce!23350
2018-11-27 13:14:51 +00:00
913740de00
Merge branch '53778-remove-site-statistics' into 'master'
...
Remove Site Statistic
Closes #53778
See merge request gitlab-org/gitlab-ce!23314
2018-11-27 12:57:51 +00:00
92bfb3c5be
Merge branch 'if-ce-54109-fix_user_by_any_email' into 'master'
...
User#find_by_any_email to respect confirmed flag on secondary emails
See merge request gitlab-org/gitlab-ce!23181
2018-11-27 12:37:54 +00:00
6a66e4a1f1
Don't remove failed install pods
...
We want to keep failed install pods around so that it is easier to debug
why a failure occured. With this change we also need to ensure that we
remove a previous pod with the same name before installing so that
re-install does not fail.
Another change here is that we no longer need to catch errors from
delete_pod! in CheckInstallationProgressService as we now catch the
ResourceNotFoundError in Helm::Api. The catch statement in
CheckInstallationProgressService was also probably too broad before and
should have been narrowed down simply to ResourceNotFoundError.
2018-11-27 12:54:32 +01:00
397fd09ac4
Merge branch 'winh-parse-boolean' into 'master'
...
Add parseBoolean helper function
See merge request gitlab-org/gitlab-ce!23283
2018-11-27 11:51:34 +00:00
07c1466b7c
Merge branch 'gt-update-env-metrics-empty-state' into 'master'
...
Update environments metrics empty state
Closes #51745
See merge request gitlab-org/gitlab-ce!23074
2018-11-27 11:34:55 +00:00
921d6b1a13
Merge branch 'upgrade_kubeclient_400' into 'master'
...
Upgrade kubeclient to 4.0.0
See merge request gitlab-org/gitlab-ce!23261
2018-11-27 11:18:36 +00:00
3a3a767c4a
Merge branch 'triggermesh-phase2-external-ip' into 'master'
...
Expose External IP address for Knative's gateway
See merge request gitlab-org/gitlab-ce!23162
2018-11-27 10:37:48 +00:00
195e33719e
Merge branch '53988-remove-notes-index-on-updated-at' into 'master'
...
Remove notes index on updated_at
Closes #53988
See merge request gitlab-org/gitlab-ce!23356
2018-11-27 10:32:15 +00:00
79ce045dc4
Fixed UI bugs with sticky diff header
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54503
2018-11-27 10:14:58 +00:00
b18556f0ad
Merge branch 'rs-new-menu-spec' into 'master'
...
Convert "New menu" feature spec to a view spec
Closes #54157
See merge request gitlab-org/gitlab-ce!23355
2018-11-27 10:09:52 +00:00
efe4067e2d
Merge branch 'rs-signed-commits-spec' into 'master'
...
Speed up "show GPG badge" feature specs
See merge request gitlab-org/gitlab-ce!23359
2018-11-27 10:08:19 +00:00
7f477f7bb7
Merge branch '53728-warn-in-web-editor-when-user-navigates-away' into 'master'
...
Resolve "Warn in Web Editor when user navigates away"
Closes #53728
See merge request gitlab-org/gitlab-ce!23004
2018-11-27 10:05:25 +00:00
5b7b482274
Resolve "Warn in Web Editor when user navigates away"
2018-11-27 10:05:25 +00:00
1fae9f36dd
Merge branch '52828-inconsistency-in-fonts-used-for-branch-name-and-create-from-fields-when-creating-new-branch-from-ui' into 'master'
...
Resolve "Inconsistency in fonts used for branch name and create from fields when creating new branch from UI"
Closes #52828
See merge request gitlab-org/gitlab-ce!23120
2018-11-27 10:03:09 +00:00
d3f033d69c
Merge branch 'bvl-use-shell-writeref' into 'master'
...
Don't use rugged write-ref anymore
See merge request gitlab-org/gitlab-ce!23286
2018-11-27 08:56:26 +00:00
124a0cab33
Merge branch 'sh-handle-string-null-bytes' into 'master'
...
Gracefully handle references with null bytes
Closes #54466
See merge request gitlab-org/gitlab-ce!23365
2018-11-27 08:54:59 +00:00
0bf740fa32
Replace `=== true` with `parseBoolean()`
2018-11-27 09:18:48 +01:00
8ef5115795
Replace convertPermissionToBoolean with parseBoolean
2018-11-27 09:18:48 +01:00
47fad3353f
Add parseBoolean helper function
2018-11-27 09:18:48 +01:00
a937eabe4c
Update ce-54109-fix_user_by_any_email.yml
2018-11-27 08:05:53 +00:00
ca52b32b46
Remove monkeypatch as now present in upstream
...
See
https://github.com/abonas/kubeclient/blob/v4.0.0/lib/kubeclient/common.rb#L395
2018-11-27 21:05:34 +13:00
ea8f0f3bcc
Merge branch 'docs/andr3-update-issue-board-screenshot' into 'master'
...
[Docs] Update issue boards images for recent cards redesign
See merge request gitlab-org/gitlab-ce!23321
2018-11-27 07:41:12 +00:00
167b277baa
Merge branch 'triggermesh-phase2-knative-description' into 'master'
...
Reword Knative cluster application
See merge request gitlab-org/gitlab-ce!23289
2018-11-27 05:11:11 +00:00
2ee8c40fc1
Merge branch '54230-eliminate-duplicated-words' into 'master'
...
Eliminate duplicated words (for docs)
See merge request gitlab-org/gitlab-ce!23183
2018-11-27 04:31:47 +00:00
ae975b9f1e
Merge branch 'patch-29' into 'master'
...
improve browse JUnit details
See merge request gitlab-org/gitlab-ce!23257
2018-11-27 04:22:45 +00:00
104eea5297
improve browse JUnit details
2018-11-27 04:22:45 +00:00
Stan Hu
Nick Thomas
Phil Hughes
Sam Bigelow
Filipa Lacerda
Thomas Pathier
Kamil Trzciński
Marcia Ramos
Dmitriy Zaporozhets
Douwe Maan
Mike Greiling
Lukas Eipert
Dylan Griffith
Grzegorz Bizon
Achilleas Pipinellis
Sean McGivern
Grzegorz Bizon
Rémy Coutable
Winnie Hellmann
Thong Kuah
Kushal Pandya
Evan Read
Ben Bodenmiller