aec1586c05
Merge branch 'lint-changelog-yaml' into 'master'
...
Add static analysis job to find invalid YAML in changelogs
See merge request gitlab-org/gitlab-ce!14518
2017-09-29 17:22:36 +00:00
c49d19a5dc
Merge branch 'fork-btn-enabled-user-groups' into 'master'
...
Fix fork button being disabled for users who can fork to group
Closes #38462
See merge request gitlab-org/gitlab-ce!14551
2017-09-29 15:55:14 +00:00
0e82f6d38d
Merge branch '38582-popover-badge' into 'master'
...
Improves UX of autodevops popover to match gpg one
Closes #38582
See merge request gitlab-org/gitlab-ce!14582
2017-09-29 15:30:56 +00:00
49fdaf9ee8
Merge branch 'hash-mr-scroll-load' into 'master'
...
Fixed anchored content not being scrolled into view
Closes #38326
See merge request gitlab-org/gitlab-ce!14562
2017-09-29 15:14:22 +00:00
1bb332ceb3
Remove changelogs with invalid extensions
...
All of these were in past releases, so missed their chance to be included in the
main changelog :-(
2017-09-29 15:32:01 +01:00
05e9c9f77e
Merge branch '36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master'
...
Insert at most 1,000 rows at once in MR diff background migration
Closes #36631 et #37505
See merge request gitlab-org/gitlab-ce!13661
2017-09-29 13:43:28 +00:00
387975fe1a
Improves UX of autodevops popover to match gpg one
2017-09-29 14:07:43 +01:00
8bac6e41ef
Fix notes type created from import
2017-09-29 11:18:58 +00:00
472be7fe61
Reschedule merge request diff background migration
...
The first attempt didn't migrate all rows on GitLab.com, due to a couple of
issues:
1. Some rows in merge_request_diffs had truly huge numbers of commits and diffs
serialised - one in particular had 26,000 commits!
2. The jobs were sometimes on Sidekiq hosts with frequent OOM errors, leading to
the job being lost.
The previous commit adds more logging, and a more robust insertion method. This
commit reschedules the jobs, with a generous pause between each.
2017-09-29 11:56:08 +01:00
8585ae61e7
Fix fork button being disabled for users who can fork to group
...
Previously the fork button was disabled for all users if they have
exceeded their project limit. This fixes that by changing the check
to see if the user can fork to a group instead of their own namespace.
This behaviour is already possible by visiting the new fork page
directly, so this just fixes the button being disabled.
Closes #38462
2017-09-29 10:51:26 +01:00
ccfe686007
Merge branch 'add-composite-index-on-merge-requests-merge-commit-sha' into 'master'
...
Add index for merge_requests.merge_commit_sha
Closes #38507
See merge request gitlab-org/gitlab-ce!14549
2017-09-29 08:57:52 +00:00
0addef2e57
Merge branch 'breadcrumb-item-links' into 'master'
...
Fixed breadcrumb title not linking
Closes #38059
See merge request gitlab-org/gitlab-ce!14532
2017-09-29 08:46:05 +00:00
2c9ca4f1e0
CHANGELOG item
2017-09-29 09:24:56 +01:00
34da9a0f37
Merge branch '37335-counter-active-state' into 'master'
...
Add active states to nav bar counters
Closes #37335
See merge request gitlab-org/gitlab-ce!14569
2017-09-29 08:06:48 +00:00
5e850d5bae
Merge branch '38528-build-url' into 'master'
...
Fixes data parameter not being sent in ajax request for jobs log
Closes #38528
See merge request gitlab-org/gitlab-ce!14564
2017-09-29 07:52:13 +00:00
494926a1fb
Add active states to nav bar counters
2017-09-28 11:25:39 -07:00
ff7deb33ae
Merge branch 'fix-mr-sidebar-counter-after-merge' into 'master'
...
Clear merge requests counter cache after merge
Closes gitlab-ee#3573 and #38344
See merge request gitlab-org/gitlab-ce!14563
2017-09-28 17:47:18 +00:00
ae03a52f09
Merge branch 'hashed-storage-migration-path' into 'master'
...
Hashed storage migration path
Closes gitlab-ee#3118
See merge request gitlab-org/gitlab-ce!14067
2017-09-28 17:26:16 +00:00
0ab2ff72a4
Merge branch 'bvl-fix-close-issuable-link' into 'master'
...
Use relative paths for opening and closing issuables
Closes #35822
See merge request gitlab-org/gitlab-ce!14555
2017-09-28 17:15:32 +00:00
e9eae3eb0d
Support custom attributes on users
2017-09-28 16:49:42 +00:00
2b407b9140
Fixes data parameter not being sent in ajax request for jobs log
2017-09-28 17:24:24 +01:00
dc32128de9
Clear merge requests counter cache after merge
...
Before this change, the MR counter in the sidebar would be wrong if an MR had
been merged since the last update, but not opened or closed, as merging did not
trigger a counter cache update.
2017-09-28 17:09:35 +01:00
9e3d1f86d5
Merge branch '13637-show-account-confirmation-link-in-e-mail-text' into 'master'
...
Changed account confirmation line to e-mail text.
Closes #13637
See merge request gitlab-org/gitlab-ce!14243
2017-09-28 16:06:00 +00:00
f4de14d71f
Add support to migrate existing projects to Hashed Storage async
2017-09-28 16:32:14 +01:00
3209c07140
Merge branch 'dm-api-unauthorized' into 'master'
...
Make sure API responds with 401 when invalid authentication info is provided
Closes #38438
See merge request gitlab-org/gitlab-ce!14525
2017-09-28 14:42:40 +00:00
576425f029
Merge branch '38319-nomethoderror-undefined-method-sha-for-nil-nilclass' into 'master'
...
Resolve "NoMethodError: undefined method `sha' for nil:NilClass"
Closes #38319
See merge request gitlab-org/gitlab-ce!14547
2017-09-28 13:12:45 +00:00
796e58e1a3
Use relative paths for opening and closing issuables
...
The abuse reports need a full issuable URL, but linking to issuables
should use the relative paths
2017-09-28 14:21:23 +02:00
b6c5a73c0b
Make sure API responds with 401 when invalid authentication info is provided
2017-09-28 14:17:52 +02:00
e0e49f2f71
Merge branch 'docs-28814-clarify-artifacts-ref' into 'master'
...
Clarify artifact download via the API only accepts branch or tag name for ref
See merge request gitlab-org/gitlab-ce!14545
2017-09-28 11:37:21 +00:00
abcfdd5c17
Add index for merge_requests.merge_commit_sha
...
This is a composite index on (target_project_id, merge_commit_sha, id)
that allows queries such as the following to use a full backwards index
scan:
SELECT "merge_requests".*
FROM "merge_requests"
WHERE "merge_requests"."deleted_at" IS NULL
AND "merge_requests"."target_project_id" = 13083
AND "merge_requests"."merge_commit_sha" = 'e80a893ff0ea8466099f6478183631af55933db2'
ORDER BY "merge_requests"."id" DESC
LIMIT 1;
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38507
2017-09-28 13:31:28 +02:00
023a61505c
Merge branch 'commit-side-by-side-comment' into 'master'
...
Fixes commit comments in parallel diff view
Closes #38117
See merge request gitlab-org/gitlab-ce!14529
2017-09-28 10:11:12 +00:00
b63e8d64c1
Handle error when fetching ref for MR with deleted source branch
...
If the ref doesn't exist, and the source branch is deleted, we can't get it back
easily. Previously, we ignored this error by shelling out, so replicate that
behaviour.
2017-09-28 11:11:10 +01:00
e03bad12bf
Merge branch 'zj-repo-gitaly' into 'master'
...
RepositoryExists is always called with #gitaly_migration
Closes #38333
See merge request gitlab-org/gitlab-ce!14513
2017-09-28 08:56:02 +00:00
7e314d6180
Merge branch '38476-improve-merge-jid-cleanup-on-merge-process' into 'master'
...
Clean merge_jid whenever necessary on the merge process
Closes #38476
See merge request gitlab-org/gitlab-ce!14540
2017-09-28 08:45:31 +00:00
11c8b8bc3c
Merge branch 'rotated_profile_image' into 'master'
...
Check orientation of profile image
See merge request gitlab-org/gitlab-ce!14461
2017-09-28 06:33:26 +00:00
3d27d157ed
Merge branch 'docs-38152-bump-recommended-mysql-version' into 'master'
...
Change recommended MySQL version to 5.6
Closes #38152
See merge request gitlab-org/gitlab-ce!14546
2017-09-28 06:33:15 +00:00
ce6fb619e5
Change recommended MySQL version to 5.6
2017-09-28 11:33:37 +07:00
3c26326e71
Clarify artifact download via the API only accepts branch or tag name for ref
2017-09-28 10:54:19 +07:00
714c062b38
Changed account confirmation line to e-mail text. This MR fixes issue #13637
...
added changelog
2017-09-28 05:46:36 +05:30
e38dc10c09
Clean merge_jid whenever necessary on the merge process
...
MergeRequest#merge_jid should be cleaned up whenever we hit a known error on MergeService#execute. This way we can keep track if the MR is really "ongoing" or "stuck"
2017-09-27 17:56:51 -03:00
e8616997d3
Breadcrumbs receives padding when double lined
2017-09-27 16:46:17 +00:00
05844d8b47
Fixed breadcrumb title not linking
...
This fixes the breadcrumb titles not having links. This was a regression
in the updated breadcrumbs introduced in 10.0.
This introduces the link for all pages rather than selectively doing it.
This will cover issues, merge requests, pipelines, jobs etc.
Closes #38059
2017-09-27 17:06:24 +01:00
d2f96827b0
Check orientation of profile image
2017-09-27 14:55:15 +00:00
fe24c0a875
Fixes commit comments in side-by-side diff view
...
This was caused by the `notes` global class not existing when the
`file_comment_button` code is run. The notes class was used to check
if the diff is currently in parallel view or not. To get around this
I've added a check into the `file_comment_button` JS to check if the
view is currently parallel or not.
Closes #38117
2017-09-27 15:38:13 +01:00
8be814c7cd
Merge branch '3523-i18n-autodevops' into 'master'
...
Improves i18n for Auto Devops callout
Closes #38406
See merge request gitlab-org/gitlab-ce!14509
2017-09-27 14:15:12 +00:00
3d611b9cdb
Update CHANGELOG.md for 10.0.2
...
[ci skip]
2017-09-27 14:33:30 +02:00
da7353d36c
Merge branch '37467-helper-method-from-users-endpoint-overrides-api-helper-method' into 'master'
...
find_user users helper method no longer overrides find_user API helper method.
Closes #37467
See merge request gitlab-org/gitlab-ce!14418
2017-09-27 11:29:57 +00:00
9034227749
Merge branch 'mr-side-by-side-breadcrumbs-container' into 'master'
...
Stop breadcrumbs changing container when in side-by-side diff
Closes #37641
See merge request gitlab-org/gitlab-ce!14454
2017-09-27 09:34:53 +00:00
f984d35f1c
Fix invalid changelog entries
2017-09-27 10:01:34 +01:00
3fba557d5c
Add static analysis job to find invalid YAML in changelogs
...
When a changelog has invalid YAML (typically, there is an unquoted @ at the
start of the author field), then the entry will be discarded. This script checks
all unreleased changelogs for validity, and runs as part of the static-analysis
step, so the pipeline will fail if this happens in future.
2017-09-27 09:52:03 +01:00
Robert Speicher
Filipa Lacerda
Phil Hughes
Sean McGivern
Rémy Coutable
Lin Jen-Shin (godfat)
Sean McGivern
Tim Zallmann
Annabel Dunstone Gray
Douwe Maan
Markus Koller
Gabriel Mazetto
Bob Van Landuyt
Douwe Maan
Grzegorz Bizon
Yorick Peterse
Achilleas Pipinellis
Mark Fletcher
bitsapien
Oswaldo Ferreira
Dimitrie Hoekstra
Guilherme Vieira
Jarka Kadlecova