db00a13584
Update CHANGELOG.md for 10.4.1
...
[ci skip]
2018-01-24 22:02:17 -06:00
44728e0527
Merge branch '39917-revert-this-merge-request-text' into 'master'
...
Resolve ""Revert this merge request" modal has confusing string"
Closes #39917
See merge request gitlab-org/gitlab-ce!16611
2018-01-24 21:06:42 +00:00
caf84a0306
Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'
...
Add formatted_data attribute to Git::WikiPage
Closes #39805
See merge request gitlab-org/gitlab-ce!16682
2018-01-24 20:56:53 +00:00
a349a4269c
Merge branch 'search-100' into 'master'
...
Use limit for search count queries
See merge request gitlab-org/gitlab-ce!16502
2018-01-24 20:21:40 +00:00
5735747050
Add formatted_data attribute to Git::WikiPage
...
Related to #39805
2018-01-24 21:14:11 +01:00
f35bac576d
Merge branch '40744-idempotent-ids' into 'master'
...
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
Closes #30783
See merge request gitlab-org/gitlab-ce!16516
2018-01-24 19:29:57 +00:00
8fe314e478
Merge branch 'feature/migrate-get-lfs-ptrs-to-gitaly' into 'master'
...
Migrate .batch_lfs_pointers to Gitaly
Closes gitaly#921
See merge request gitlab-org/gitlab-ce!16517
2018-01-24 19:25:30 +00:00
956c55e2ab
Merge branch 'dm-project-system-hooks-in-transaction' into 'master'
...
Execute system hooks after-commit when executing project hooks
See merge request gitlab-org/gitlab-ce!16673
2018-01-24 19:22:23 +00:00
2fe57353cc
Avoid array indices to fixtures in JS specs
2018-01-24 18:36:54 +00:00
29fa930baf
Migrate .batch_lfs_pointers to Gitaly
...
Closes gitaly#921
2018-01-24 19:02:51 +01:00
eceeafb6bb
Updates `Revert this merge request` text
...
Changes the text in the Revert merge request modal: `Start a new merge request with these changes` => `Start a new merge request with the revert changes`.
2018-01-24 18:42:12 +01:00
a403011e4f
Merge branch '42361-workaround' into 'master'
...
Resolve "Spec failure in ./spec/features/issues/spam_issues_spec.rb"
Closes #42361
See merge request gitlab-org/gitlab-ce!16671
2018-01-24 17:41:40 +00:00
bbe00038da
Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL
2018-01-24 17:25:55 +00:00
93ea3234df
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
2018-01-24 17:25:55 +00:00
5a4fb8f0d1
Merge branch 'rc/move-one-spinach-job-to-rspec' into 'master'
...
Remove one Spinach job and add one RSpec job
See merge request gitlab-org/gitlab-ce!16675
2018-01-24 17:20:24 +00:00
f441fe7b54
Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master'
...
Migrate repository bundling to Gitaly
Closes gitaly#929
See merge request gitlab-org/gitlab-ce!16563
2018-01-24 16:54:54 +00:00
c0d7dd38f9
Workaround a recaptcha pop-up that cannot be tested
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-24 17:54:09 +01:00
59a13575a1
Merge branch 'patch-28' into 'master'
...
Fix typo in `.gitlab-ci.yml` heading
See merge request gitlab-org/gitlab-ce!16668
2018-01-24 15:47:59 +00:00
9f5390d81d
Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'
...
Return more consistent values for merge_status on V4 MR APIs
Closes #20639
See merge request gitlab-org/gitlab-ce!16626
2018-01-24 15:09:16 +00:00
c28ffa1da3
Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master'
...
Add application create API
Closes #24035
See merge request gitlab-org/gitlab-ce!16643
2018-01-24 14:44:49 +00:00
4564795195
Execute system hooks after-commit when executing project hooks
2018-01-24 15:10:06 +01:00
4a3e22a9c0
Remove one Spinach job and add one RSpec job
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-24 15:03:59 +01:00
38ef39550c
Remove callback as we already update accordingly on services
2018-01-24 11:47:37 -02:00
09da89e634
Merge branch 'groups-webpack-bundle' into 'master'
...
Added dispatcher imports for groups webpack bundle
See merge request gitlab-org/gitlab-ce!16644
2018-01-24 12:11:28 +00:00
8a852dee62
Fix typo in `.gitlab-ci.yml` heading
2018-01-24 12:03:12 +00:00
24625323a8
Migrate repository bundling to Gitaly
...
Closes gitaly#929
2018-01-24 12:10:31 +01:00
e2a56af930
Merge branch 'sh-fix-cross-site-forgery-errors' into 'master'
...
Return a blank JSON response for a missing .js file to prevent Rails CSRF errors
Closes #40771
See merge request gitlab-org/gitlab-ce!16664
2018-01-24 10:47:17 +00:00
47f6dbdf47
Merge branch 'ph-even-more-dispatcher-imports' into 'master'
...
Added imports for dispatcher routes
See merge request gitlab-org/gitlab-ce!16640
2018-01-24 10:17:15 +00:00
0f5f77a04c
Merge branch 'winh-axios-mock-restore' into 'master'
...
Use restore() instead of reset() for removing axios MockAdapter
See merge request gitlab-org/gitlab-ce!16647
2018-01-24 09:50:39 +00:00
8d338d7386
Merge branch 'rc/improve-setup-test-env' into 'master'
...
Speed-up setup-test-env
See merge request gitlab-org/gitlab-ce!16621
2018-01-24 09:38:28 +00:00
d92bd8e2a5
Merge branch 'fix/gitaly-can-be-merged-for-missing-conflict-files' into 'master'
...
GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side
See merge request gitlab-org/gitlab-ce!16655
2018-01-24 09:34:15 +00:00
f8385188f0
Merge branch 'qa-deploy-key-factory-product' into 'master'
...
Scrap the deploy key title and match it in test
See merge request gitlab-org/gitlab-ce!16554
2018-01-24 09:22:10 +00:00
de2c642199
Merge branch '32546-cannot-copy-paste-on-ios' into 'master'
...
Resolve "Cannot copy/paste on iOS"
Closes #32546
See merge request gitlab-org/gitlab-ce!15804
2018-01-24 09:04:25 +00:00
e22c007f50
added missing imports
2018-01-24 08:45:08 +00:00
aaf03c0c48
correctly imports performance bar
2018-01-24 08:45:07 +00:00
adf31a57f4
Added imports for dispatcher routes
2018-01-24 08:45:06 +00:00
45b62dfd32
Make the exposing of the Application secret more explicit
...
To make it more clear to developers that the entity exposes the
application secret, define a separate entity that only should be used
when the secret is needed (probably only on creation).
2018-01-24 09:44:07 +01:00
d38faa30ed
Add documentation about when the application API was added
2018-01-24 09:42:04 +01:00
81bbcfacb0
Add application create API
2018-01-24 09:42:04 +01:00
79a829a037
Return a blank JSON response for a missing .js file to prevent Rails CSRF errors
...
The default 404 handler would return the Content-Type format based on the
given format extension. This would cause the Rails CSRF protection to flag an
error, since the .js extension gets mapped to text/javascript format.
Closes #40771
2018-01-23 22:24:30 -08:00
194e1b8f32
add CHANGELOG.md entry for !15804
2018-01-24 00:11:19 -06:00
ac5cbb6cd6
disable CopyAsGFM on iOS due to bug in webkit
2018-01-24 00:11:19 -06:00
74da79113b
Merge branch '42251-explicit-timezone-for-karma' into 'master'
...
Set timezone for karma CI job to Etc/UTC (UTC+0)
Closes #42251
See merge request gitlab-org/gitlab-ce!16602
2018-01-23 22:37:14 +00:00
090ca9c33e
Use limit for search count queries
...
Search query is especially slow if a user searches a generic string
which matches many records, in such case search can take tens of
seconds or time out. To speed up the search query, we search only for
first 1000 records, if there is >1000 matching records we just display
"1000+" instead of precise total count supposing that with such amount
the exact count is not so important for the user.
Because for issues even limited search was not fast enough, 2-phase
approach is used for issues: first we use simpler/faster query to get
all public issues, if this exceeds the limit, we just return the limit.
If the amount of matching results is lower than limit, we re-run more
complex search query (which includes also confidential issues).
Re-running the complex query should be fast enough in such case because the
amount of matching issues is lower than limit.
Because exact total_count is now limited, this patch also switches to
to "prev/next" pagination.
Related #40540
2018-01-23 22:33:42 +01:00
c5893d5c83
Update changelog
2018-01-23 19:30:29 -02:00
0b965528c6
GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side
2018-01-23 22:16:51 +01:00
fbbd81eee6
Merge branch '42340-ci-failing-on-mergerequestdiff-commits_count' into 'master'
...
Resolve "CI failing on MergeRequestDiff#commits_count="
Closes #42340
See merge request gitlab-org/gitlab-ce!16653
2018-01-23 21:15:33 +00:00
dc84313e73
Return more consistent values for merge_status on MR API
2018-01-23 19:08:24 -02:00
44bdfa1a37
Merge branch 'fix-gitlab-runner-2652' into 'master'
...
Fix docs for GIT_CHECKOUT Gitlab Runner configuration
Closes gitlab-runner#2652
See merge request gitlab-org/gitlab-ce!16522
2018-01-23 18:35:13 +00:00
b443c9b0f1
Merge branch 'dm-push-rule-regexp-error-ce' into 'master'
...
Backport changes to Gitlab::Checks::ChangeAccess from EE
See merge request gitlab-org/gitlab-ce!16652
2018-01-23 17:20:51 +00:00
Robert Speicher
Fatih Acet
Robert Speicher
Yorick Peterse
Ahmad Sherif
Nick Thomas
Jacopo
Rémy Coutable
Douwe Maan
Douwe Maan
Oswaldo Ferreira
Filipa Lacerda
Mathijs de Kruyf
Grzegorz Bizon
Phil Hughes
Toon Claes
Toon Claes
Nicolas MERELLI
Stan Hu
Mike Greiling
Jan Provaznik
Kamil Trzciński