5679837cd4
Start to use Danger for automating MR reviews
...
Signed-off-by: Rémy Coutable <remy@rymai.me >
2018-07-11 11:52:01 +02:00
d2ea56a870
Merge branch '46519-remove-ce-prefix-suffix-in-check-ce' into 'master'
...
Resolve "ee_compat_check should remove `ce-` prefix or `-ce` suffix as ee-specific check"
Closes #46519
See merge request gitlab-org/gitlab-ce!20532
2018-07-11 09:25:54 +00:00
eae40e700b
Merge branch 'runners-max-timeout-param' into 'master'
...
Add missing maximum_timeout parameter
Closes #48625
See merge request gitlab-org/gitlab-ce!20355
2018-07-11 09:13:28 +00:00
068defa750
Add missing maximum_timeout parameter
2018-07-11 09:13:28 +00:00
e68a547bc7
Merge branch 'rails5-autoload' into 'master'
...
[Rails5] Permit concurrent loads
Closes #48263
See merge request gitlab-org/gitlab-ce!20473
2018-07-11 08:36:26 +00:00
078c824f3b
Merge branch 'fix-doc-on-migration' into 'master'
...
Fix doc for large table column rename
See merge request gitlab-org/gitlab-ce!20544
2018-07-11 08:32:32 +00:00
2be54f1bbf
Fix doc for large table column rename
2018-07-11 14:38:29 +08:00
c6b670216c
Merge branch 'sh-handle-colons-in-url-passwords' into 'master'
...
Properly handle colons in URL passwords
Closes #49080
See merge request gitlab-org/gitlab-ce!20538
2018-07-11 06:00:17 +00:00
c2a0a3ab1a
Merge branch 'sh-fix-git-gc-error-handling' into 'master'
...
Fix ArgumentError in GitGarbageCollectWorker Sidekiq job
Closes #49096
See merge request gitlab-org/gitlab-ce!20541
2018-07-10 23:13:50 +00:00
0c1eebe24c
Fix ArgumentError in GitGarbageCollectWorker Sidekiq job
...
When the Gitaly call failed, the exception handling failed
because `method` is expected to have a parameter.
Closes #49096
2018-07-10 15:11:10 -07:00
718a23fd36
Properly handle colons in URL passwords
...
Before b46d5b13ecCloses #49080
2018-07-10 13:09:37 -07:00
9e72e5e653
Merge branch 'winh-speedup-smartinterval-tests' into 'master'
...
Mock timeouts and Promise in SmartInterval tests
See merge request gitlab-org/gitlab-ce!20496
2018-07-10 19:28:14 +00:00
66ad04e40c
Mock timeouts and Promise in SmartInterval tests
2018-07-10 19:28:14 +00:00
e4047ad6f9
Find the EE branch by searching the branches
...
This uses a similar approach in ee_specific_check.rb
2018-07-11 01:49:35 +08:00
5bd8bfb66c
Merge branch 'bvl-remove-pot-timestamps' into 'master'
...
Remove timestamps from `locale/gitlab.pot`
Closes #49077
See merge request gitlab-org/gitlab-ce!20533
2018-07-10 17:08:20 +00:00
f6d22ec11e
Remove timestamps from locale/gitlab.pot
...
This will help us avoid conflicts when regenerating the pot file, the
timestamps aren't used by Crowdin.
2018-07-10 18:37:30 +02:00
49d7f92fd7
Merge branch 'add-dst-support-to-pipeline-schedule' into 'master'
...
Add daylight saving time support for pipeline schedules
Closes #37165
See merge request gitlab-org/gitlab-ce!20145
2018-07-10 15:22:13 +00:00
798608af94
Add daylight saving time support for pipeline schedules
2018-07-10 15:22:13 +00:00
b40e71d6f3
Merge branch 'fix-conflicts-exception-for-submodules' into 'master'
...
Make sure ConflictsService does not raise for conflicting submodules
See merge request gitlab-org/gitlab-ce!20528
2018-07-10 14:52:08 +00:00
c9e4def9c8
Merge branch 'patch-28' into 'master'
...
Fix a typo on CI Runner page on Projects
See merge request gitlab-org/gitlab-ce!20467
2018-07-10 14:47:32 +00:00
fa39876ecb
Fix a typo on CI Runner page on Projects
2018-07-10 14:47:32 +00:00
0abda34c4c
Merge branch 'rd-6804-bug-unable-to-delete-branches-when-repo-reaches-the-size-limit-ce' into 'master'
...
Backport some changes from EE
See merge request gitlab-org/gitlab-ce!20388
2018-07-10 14:29:16 +00:00
57fc7cd8f3
Make sure ConflictsService does not raise for conflicting submodules
2018-07-10 15:06:20 +01:00
d01e5a04cc
Merge branch 'revert-3755d828' into 'master'
...
Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"
See merge request gitlab-org/gitlab-ce!20525
2018-07-10 13:53:47 +00:00
7358211ece
Merge branch '49057-fix-repository-typo' into 'master'
...
Fix a typo in Gitlab::Git::Repository
See merge request gitlab-org/gitlab-ce!20520
2018-07-10 13:32:20 +00:00
b7531f71a6
Merge branch '48578-disable-gcp-free-credit-banner-at-instance-level' into 'master'
...
Resolve "Disable GCP free credit banner at instance level"
Closes #48578
See merge request gitlab-org/gitlab-ce!20379
2018-07-10 13:20:05 +00:00
fe268175a2
Resolve "Disable GCP free credit banner at instance level"
2018-07-10 13:20:05 +00:00
3d4873fa64
Merge branch 'docs/codequality' into 'master'
...
Rename code climate to code quality
See merge request gitlab-org/gitlab-ce!20506
2018-07-10 12:39:55 +00:00
ee740d5ee0
Rename code climate to code quality
2018-07-10 12:39:55 +00:00
191d8ecff6
Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"
...
This reverts merge request !20140
2018-07-10 12:38:15 +00:00
6152d7a33e
Merge branch 'ce-6117-unify-preview-mailer' into 'master'
...
CE: Resolve "Extract EE specific files/lines for spec/mailers, app/mailers/preview"
See merge request gitlab-org/gitlab-ce!20508
2018-07-10 12:25:24 +00:00
1f52607198
Merge branch 'rails5-mysql-rename-column' into 'master'
...
Rails5 MySQL fix rename_column as part of cleanup_concurrent_column_type_change for timestamps
See merge request gitlab-org/gitlab-ce!20514
2018-07-10 11:24:35 +00:00
e08d54225b
Merge branch 'rd-ee-backport-add-support-for-gl-com-trials' into 'master'
...
Backport some changes made for this spec in EE
See merge request gitlab-org/gitlab-ce!20318
2018-07-10 11:07:53 +00:00
fdfc8d04d2
[Rails5] Permit concurrent loads
...
Rails 5 introduced a new (and safer) autoload mechanism which
uses locking when loading missing constants. Under some circumstances
it's possible that a deadlock occurs in multi-threaded environment
(especially when running capybara tests)
To avoid these deadlocks, concurrent load is enabled when loading
policies - we ere hitting timeout in this case:
https://gitlab.com/gitlab-org/gitlab-ce/issues/48263
Note that autoloading is enabled only in development or test envs
(not in production).
2018-07-10 12:52:57 +02:00
f3edbafe63
Merge branch 'docs-bitbucket-typo' into 'master'
...
Update bitbucket.md to fix typo and small grammar touchups.
See merge request gitlab-org/gitlab-ce!20482
2018-07-10 10:50:17 +00:00
ca4eb4447d
Update bitbucket.md to fix typo and small grammar touchups.
2018-07-10 10:50:17 +00:00
433189c85e
Merge branch 'syntax-test-branch' into 'master'
...
Update time_helper.rb to fix output for exact minutes.
Closes #48948
See merge request gitlab-org/gitlab-ce!20479
2018-07-10 10:49:28 +00:00
8aac79be53
Update time_helper.rb to fix output for exact minutes.
2018-07-10 10:49:28 +00:00
7407efe19c
Merge branch 'rjh/doc-update-for-gitlab-pages' into 'master'
...
Document update for GitLab Pages users.
See merge request gitlab-org/gitlab-ce!20412
2018-07-10 10:32:53 +00:00
54e127a8bb
Document update for GitLab Pages users.
2018-07-10 10:32:53 +00:00
0008961dac
Merge branch 'fix-api-docs-simple-projects' into 'master'
...
Fix API docs around unauthenticated projects return fields
See merge request gitlab-org/gitlab-ce!20477
2018-07-10 10:31:18 +00:00
937d916b5f
Merge branch 'gitaly-mandatory-20180709-jv' into 'master'
...
Use Gitaly for fetches and creating bundles
Closes gitaly#387, gitaly#874, gitaly#750, and gitaly#665
See merge request gitlab-org/gitlab-ce!20490
2018-07-10 10:22:05 +00:00
c7b8afcd90
Merge branch 'improve-metadata-access-performance' into 'master'
...
Improve metadata access performance
See merge request gitlab-org/gitlab-ce!20493
2018-07-10 09:21:11 +00:00
1f28f4567b
Fix a typo? gitaly_operation{-s-}_client
2018-07-10 16:52:34 +08:00
f5f5a4e677
Merge branch '48537-update-avatar-only-via-api' into 'master'
...
Resolve "PUT /projects/:id : unable to update avatar alone"
Closes #48537
See merge request gitlab-org/gitlab-ce!20505
2018-07-10 08:44:20 +00:00
e6b91cc357
Merge branch '42415-omit-projects-from-get-group-endpoint' into 'master'
...
Resolve "API: /groups/:name query very slow for groups with many projects"
Closes #42415
See merge request gitlab-org/gitlab-ce!20494
2018-07-10 08:44:02 +00:00
c7dd9a6e04
Merge branch 'winh-mounthelper-path-docs' into 'master'
...
Fix mountComponent helper path in docs
See merge request gitlab-org/gitlab-ce!20511
2018-07-10 08:42:31 +00:00
2f96930d5c
Merge branch 'winh-stop-all-environments' into 'master'
...
Support manually stopping any environment from the UI
Closes #25388
See merge request gitlab-org/gitlab-ce!20077
2018-07-10 08:11:04 +00:00
d79cef3a9a
Support manually stopping any environment from the UI
2018-07-10 08:11:04 +00:00
ca1deb9e5e
Merge branch '48951-clean-up' into 'master'
...
Resolve "MR refactor: All actions under diff module are being exported twice"
Closes #48951
See merge request gitlab-org/gitlab-ce!20499
2018-07-10 07:38:48 +00:00
