93c7b6c51a
Merge branch 'winh-lint-console-tests' into 'master'
...
Enable no-console ESLint rule for tests
See merge request gitlab-org/gitlab-ce!20812
2018-07-31 19:03:19 +00:00
400925c480
Merge branch 'sh-lfs-fix-content-type' into 'master'
...
Fix LFS uploads not working with git-lfs 2.5.0
Closes #49752
See merge request gitlab-org/gitlab-ce!20923
2018-07-31 17:26:56 +00:00
1a95603510
Merge branch 'revert-c90d7633' into 'master'
...
Revert "Merge branch '48098-mutual-auth-cluster-applications' into 'master'"
See merge request gitlab-org/gitlab-ce!20925
2018-07-31 14:20:37 +00:00
2fe57a4108
Merge branch 'fj-37736-improve-performance-post-receive-cleaning-code' into 'master'
...
Code cleaning in PostReceive services
See merge request gitlab-org/gitlab-ce!20916
2018-07-31 14:07:24 +00:00
8402d67aab
Code cleaning in PostReceive services
2018-07-31 14:07:24 +00:00
7eba853717
Merge branch 'zj-remove-git-rake-tasks' into 'master'
...
Remove git rake tasks
Closes #41699 and gitaly#768
See merge request gitlab-org/gitlab-ce!20806
2018-07-31 13:50:44 +00:00
b21730116e
Revert "Merge branch '48098-mutual-auth-cluster-applications' into 'master'"
...
This reverts merge request !20801
2018-07-31 13:15:18 +00:00
c5645a6739
Fix LFS uploads not working with git-lfs 2.5.0
...
git-lfs 2.5.0 now sets the Content-Type header instead of hard-coding it to
application/octet-stream: https://github.com/git-lfs/git-lfs/pull/3137
To avoid this issue, we explicitly tell the client to use
application/octet-stream.
Closes #49752
2018-07-31 06:15:14 -07:00
5a3948a573
Merge branch 'todos-visibility-change' into 'master'
...
Delete todos when users loses target read permissions
See merge request gitlab-org/gitlab-ce!20665
2018-07-31 13:09:19 +00:00
4600265e00
Remove gitlab:user:check_repos task
...
While reviewing this branch it was noted that this task was broken.
Given the limited value this task brings, and given the fact that much
of the old behaviour has been moved to be automatically fixed, removing
was a good option.
Suggestion in:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20806#note_91261001
2018-07-31 14:31:51 +02:00
4702c9f703
Bump Gitaly version
...
This branch includes changes that removes a rake taks that cleans up
config.lock files.
This change bumps Gitaly so it happens automatically so users don't have
to bother.
2018-07-31 14:31:50 +02:00
f1f7bfc06f
Remove git rake tasks
...
These tasks are happening through housekeeping right now, by default
ever 10th push. This removes the need for these tasks.
Side note, this removes one of my first contributions to GitLab, as back
than I introduced these tasks through: 54e6c0045bhttps://gitlab.com/gitlab-org/gitaly/issues/768
2018-07-31 14:31:50 +02:00
e9d04585f8
Merge branch 'fix-storage-size-for-artifacts-change' into 'master'
...
Update total storage size when changing size of artifacts
See merge request gitlab-org/gitlab-ce!20697
2018-07-31 11:14:05 +00:00
d3e24d0503
Merge branch 'ce-application-settings' into 'master'
...
CE application settings (not Docs) Cleanup
See merge request gitlab-org/gitlab-ce!20723
2018-07-31 11:08:12 +00:00
e6dd3c5276
Merge branch 'feature/gb/login-activity-metrics' into 'master'
...
Add user authentication activity metrics
Closes #47789
See merge request gitlab-org/gitlab-ce!20668
2018-07-31 10:44:22 +00:00
eb8597a1b9
Merge branch '25990-interactive-web-terminals-authorization' into 'master'
...
Fix authorization for interactive web terminals
See merge request gitlab-org/gitlab-ce!20811
2018-07-31 10:34:14 +00:00
bdc8396e25
Remove todos when project feature visibility changes
2018-07-31 12:32:08 +02:00
84626f0d07
Merge branch '49161-disable-toggle-comments' into 'master'
...
Resolve "MR refactor: Disable toggle comments button when diff has no discussions"
Closes #49161
See merge request gitlab-org/gitlab-ce!20667
2018-07-31 10:21:04 +00:00
2ff8b9319f
Merge branch '7038-create-issue-regression' into 'master'
...
CE-Port of gitlab-ee!6708
Closes gitlab-ee#7038
See merge request gitlab-org/gitlab-ce!20917
2018-07-31 10:06:53 +00:00
3b81345a73
Add changelog for authentication activity metrics
2018-07-31 12:03:50 +02:00
30aa901d8d
ensure that merge request widget serializer exposes `can_create_issue`
2018-07-31 11:02:21 +02:00
32de37536e
Disables toggle comments button for diff with no discussions
2018-07-31 09:24:36 +01:00
02e35a0d26
Merge branch 'ide-warn-staged-files' into 'master'
...
Warn in IDE when user navigates away with staged changes
See merge request gitlab-org/gitlab-ce!20857
2018-07-31 07:54:27 +00:00
de8f8cdf06
Improve authentication activity code readability
2018-07-31 09:24:19 +02:00
e61c0407a4
Merge branch '49747-update-poll-2xx' into 'master'
...
Resolve "Update poll.js to keep polling if the status code is 2xx"
Closes #49747
See merge request gitlab-org/gitlab-ce!20904
2018-07-31 07:22:01 +00:00
2170a7156b
Merge branch 'fj-49512-fix-gitlab-git-pages-encoding' into 'master'
...
Fix bug with Wiki pages encoding
Closes #49512
See merge request gitlab-org/gitlab-ce!20906
2018-07-31 06:08:19 +00:00
ade320d2db
Fix bug with Wiki pages encoding
2018-07-31 06:08:19 +00:00
7758fdf1ad
Update CHANGELOG.md for 11.1.4
...
[ci skip]
2018-07-30 23:59:29 +00:00
bb7d914d20
Merge branch 'sh-fix-health-docs' into 'master'
...
Fix typo in health check documentation
[ci skip]
Closes #49733
See merge request gitlab-org/gitlab-ce!20914
2018-07-30 21:36:49 +00:00
c0cac16506
Merge branch 'extract-ee-specific-lines-from-issuable-finders' into 'master'
...
Extract EE-specific lines from issuable finders
See merge request gitlab-org/gitlab-ce!20899
2018-07-30 21:35:34 +00:00
97383336aa
Fix typo in health check documentation
...
Closes #49733
2018-07-30 14:16:27 -07:00
e9c9f2e81c
Merge branch 'update-efs-documentation' into 'master'
...
Clean up AWS EFS documentation
See merge request gitlab-org/gitlab-ce!20912
2018-07-30 20:39:20 +00:00
06cd8fdf76
Merge branch 'patch-24' into 'master'
...
Fix typos in CreateGpgSignatureWorker spec
See merge request gitlab-org/gitlab-ce!20910
2018-07-30 20:17:19 +00:00
341d379e07
Fix typos in CreateGpgSignatureWorker spec
2018-07-30 20:17:19 +00:00
1adfb156e8
Merge branch 'sh-simplify-liveness-check' into 'master'
...
Add /-/health basic health check endpoint
See merge request gitlab-org/gitlab-ce!20456
2018-07-30 20:05:06 +00:00
15fe5c5a3c
Clean up AWS EFS documentation
2018-07-30 15:24:34 -04:00
934f1f6902
Merge branch 'sh-fix-admin-jobs-controller-timing-out' into 'master'
...
Fix /admin/jobs failing to load due to statement timeout
Closes #49767
See merge request gitlab-org/gitlab-ce!20909
2018-07-30 19:09:46 +00:00
016dadc860
Merge branch '32821-better-error-message-add-invalid-user-to-project' into 'master'
...
Resolve "Improve Error Message When Adding Invalid User to Project via API"
Closes #32821
See merge request gitlab-org/gitlab-ce!20885
2018-07-30 18:46:22 +00:00
0a40035c07
Merge branch 'sh-make-unicorn-work-rbtrace' into 'master'
...
Make rbtrace work under unicorn
See merge request gitlab-org/gitlab-ce!20892
2018-07-30 18:28:37 +00:00
00709a13a4
Fix /admin/jobs failing to load due to statement timeout
...
The `ORDER BY created_at DESC` clause causes a sequential scan because
there is no index on the `created_at` column. We can sort by `id`
or by `updated_at` to make things fast.
Closes #49767
2018-07-30 10:03:05 -07:00
cb2e07309b
Merge branch 'fj-37736-improve-performance-post-receive-create-gpg-siganture-worker' into 'master'
...
Create GPG commit signature in bulk
See merge request gitlab-org/gitlab-ce!20870
2018-07-30 16:55:28 +00:00
9a81550fed
Create GPG commit signature in bulk
2018-07-30 16:55:28 +00:00
5b6553a081
Merge branch 'fix-cycle-analytics-link-doc' into 'master'
...
Fix link to Cycle Analytics in help
Closes #49729
See merge request gitlab-org/gitlab-ce!20895
2018-07-30 16:34:21 +00:00
5bab78950d
Improve error message when adding invalid user to a project
2018-07-30 18:19:57 +02:00
6f240d7b0c
Merge branch 'rails5-gpg-permit-concurrent' into 'master'
...
Permit concurrent loads in gpg keychain mutex
See merge request gitlab-org/gitlab-ce!20894
2018-07-30 16:00:31 +00:00
ff060ad405
Merge branch 'workhorse-5-1-0' into 'master'
...
Update GitLab Workhorse to v5.1.0
See merge request gitlab-org/gitlab-ce!20900
2018-07-30 15:18:57 +00:00
2507d0abc9
Merge branch 'sh-bump-prometheus-client-mmap-gem' into 'master'
...
Bump prometheus-client-mmap to 0.9.4
See merge request gitlab-org/gitlab-ce!20891
2018-07-30 15:17:30 +00:00
37748e44f7
Move rbtrace initialization into Sidekiq
2018-07-30 08:12:45 -07:00
820923664d
Make rbtrace work under unicorn
...
The Unicorn master resets any signal handlers and prevents rbtrace
from working properly as a result. Move the `require 'rbtrace'` call
to the Unicorn `after_fork` block and keep the initializer only for Sidekiq.
2018-07-30 08:12:45 -07:00
18a1bcf862
Fix authorization for web terminals
...
Workhorse was not able to parse the `headers` property since it was expecting a
key => array as a structure.
Error from workhorse: preAuthorizeHandler: decode authorization response: json:
cannot unmarshal string into Go struct field TerminalSettings.Header of type
[]string
Workhorse was not changed since this api is already used for the environment
terminals.
gitlab-org/gitlab-ce#25990
2018-07-30 16:58:59 +02:00
Mike Greiling
Nick Thomas
Rémy Coutable
Francisco Javier López 🌴 (About to) On vacation; back on August 22th!
Sean McGivern
Mayra Cabrera
Stan Hu
Zeger-Jan van de Weg
Kamil Trzciński
Jarka Kadlecová
Phil Hughes
Grzegorz Bizon
Grzegorz Bizon
Lukas Eipert
Filipa Lacerda
GitLab Release Tools Bot
Robert Speicher
Sid Sijbrandij
Peter Leitzen
Joshua Lambert
Jacopo
Steve Azzopardi