b1f236164e
Put fallback reply-key address first in the References header
...
The References header is an ordered list of mails, and some clients
only look at the last mail in the list to determine to which mail the
mail is in reply to.
Therefore, to be a less obtrusive as possible, put the fallback
address first.
Some info about the reply key lookup in the References header:
https://docs.gitlab.com/ee/administration/reply_by_email.html#how-it-works
2018-07-27 15:12:52 +02:00
3bcb04f100
Add mutation toggling WIP state of merge requests
...
This is mainly the setup of mutations for GraphQL. Including
authorization and basic return type-structure.
2018-07-25 18:37:12 +02:00
37af75a2e0
Resolve "do not set updated_at when creating note"
2018-07-12 09:26:09 +00:00
8717c7dad9
Revert "Merge branch 'ee-5481-epic-todos' into 'master'"
...
This reverts commit 4d9a3f42f1ecf9c145f6
2018-07-11 18:33:24 +02:00
a63bce1a4b
Resolve "Rename the `Master` role to `Maintainer`" Backend
2018-07-11 14:36:08 +00:00
4ee08b77bc
Updates from `rubocop -a`
2018-07-09 21:13:08 +08:00
8cc2c08aa7
Include wget in apk add command
...
Closes #48978
2018-07-08 10:27:49 -05:00
68d138e85e
Merge branch 'remove-trace-efficiently' into 'master'
...
Remove redundant query when removing trace
See merge request gitlab-org/gitlab-ce!20324
2018-07-06 09:21:40 +00:00
f60ffd5422
Fix static analysys
2018-07-06 17:08:00 +09:00
9bdb4b179a
Add spec
2018-07-06 16:03:06 +09:00
1667b65c1e
Use AlreadyArchivedError if it's the case
2018-07-06 15:19:01 +09:00
254134fbb5
Prevent WRITE opetaions if it's already archived
2018-07-05 10:56:15 +09:00
4d9a3f42f1
Merge branch 'ee-5481-epic-todos' into 'master'
...
Port of Todos for epics
See merge request gitlab-org/gitlab-ce!19908
2018-07-04 12:57:37 +00:00
d026441b3c
Merge branch 'ccr/flaky_mr_list_spec' into 'master'
...
Fix flaky spec for merge request lists
See merge request gitlab-org/gitlab-ce!20316
2018-07-04 10:36:06 +00:00
34694c3afc
Merge branch 'jprovazn-direct-upload' into 'master'
...
Add workhorse authorize method for project/group uploads
Closes #44663
See merge request gitlab-org/gitlab-ce!19717
2018-07-04 09:50:29 +00:00
7458ca8ebb
[backend] Addressed review comments
...
* Group filtering now includes also issues/MRs from
subgroups/subprojects
* fixed due_date
* Also DRYed todo controller specs
2018-07-03 09:34:44 +02:00
b7e6e4e48b
Fixed flaky spec for merge request lists
2018-07-02 09:31:29 -07:00
3cf683629e
Merge branch 'ccr/add_locked_state' into 'master'
...
Add locked state to merge request API
See merge request gitlab-org/gitlab-ce!20186
2018-07-01 09:25:01 +00:00
efaca5ded0
Merge branch 'da-exclusive-lease-helpers' into 'master'
...
Add helper methods to stub Gitlab::ExclusiveLease
See merge request gitlab-org/gitlab-ce!20253
2018-06-29 17:54:01 +00:00
3223771beb
Merge branch 'rails5-fix-48430' into 'master'
...
Rails5 fix MySQL milliseconds problem in specs
Closes #48430
See merge request gitlab-org/gitlab-ce!20221
2018-06-29 09:37:29 +00:00
34dbccb24b
Add helper methods to stub Gitlab::ExclusiveLease
2018-06-28 19:24:40 -03:00
c2b622b2a4
Add locked state to merge request API
2018-06-28 07:12:00 -07:00
63c64ab323
Merge branch 'bvl-graphql-permissions' into 'master'
...
expose permissions on types
Closes #47695
See merge request gitlab-org/gitlab-ce!20152
2018-06-28 12:24:21 +00:00
54b56f20b7
Expose permissions on types in GraphQL
...
This adds a reusable way to expose permissions for a user to types in
GraphQL.
2018-06-28 13:50:17 +02:00
f0eaf22553
Rails5 fix MySQL milliseconds problem in specs
2018-06-27 18:49:22 +02:00
4878ef2fa7
CE port gitlab-ee!6112
2018-06-27 11:41:16 +00:00
14d1efc0e9
Bring changes from EE
2018-06-21 23:15:59 +08:00
3e66795ef1
Changes tab VUE refactoring
2018-06-21 12:22:40 +00:00
656d4ebf67
Add workhorse authorize method for project/group uploads
...
This method can be used by workhorse to get presigned
URLs used for direct upload of files.
2018-06-18 09:11:02 +02:00
2fec418336
ChatNotificationService - fix sending tag notifications when "only default branch" enabled
2018-06-14 11:57:15 -06:00
a66af9b121
Merge branch '47513-upload-migration-lease-key-is-incorrect-for-non-mounted-uploaders' into 'master'
...
Resolve "Upload migration lease key is incorrect for non-mounted uploaders"
Closes #47513
See merge request gitlab-org/gitlab-ce!19600
2018-06-13 09:45:34 +00:00
8d9e0c0b8c
Merge branch '47408-migrateuploadsworker-is-doing-n-1-queries-on-migration' into 'master'
...
Resolve "`MigrateUploadsWorker` is doing N+1 queries on migration"
Closes #47408
See merge request gitlab-org/gitlab-ce!19547
2018-06-13 08:30:35 +00:00
c3f499e7c8
Use upload ID instead of model ID in lease key
...
For FileUploaders it's possible that a model has many uploads
and if lease key is created only from model id, it causes that
the model's uploads can not be migrated in parallel because the
exclusive lease key would be same for all uploads of the model.
2018-06-12 09:34:07 +02:00
50872bcc24
fix the failing spec
2018-06-07 12:06:00 -04:00
6d165c740c
Make all uses of `fixture_file_upload` use relative paths
2018-06-07 09:54:41 -05:00
96747556e7
Merge branch 'live-trace-v2-persist-data' into 'master'
...
Live trace: Rescue stale live trace
See merge request gitlab-org/gitlab-ce!18680
2018-06-06 12:45:41 +00:00
9b65d4bb41
Initial setup GraphQL using graphql-ruby 1.8
...
- All definitions have been replaced by classes:
http://graphql-ruby.org/schema/class_based_api.html
- Authorization & Presentation have been refactored to work in the
class based system
- Loaders have been replaced by resolvers
- Times are now coersed as ISO 8601
2018-06-06 10:58:54 +02:00
cae1735276
Fix typos and add a small spec
2018-06-06 17:49:48 +09:00
f9b821f08d
Fix specs for exclusive lease
2018-06-06 17:49:48 +09:00
32f825c648
Add tests for each new code
2018-06-06 17:49:48 +09:00
aa4b1ae712
Add `present_using` to types
...
By specifying a presenter for the object type, we can keep the logic
out of `GitlabSchema`.
The presenter gets initialized using the object being presented, and
the context (including the `current_user`).
2018-06-05 20:47:42 +02:00
e30168ddb7
Merge branch '46845-update-email_spec-to-2-2-0' into 'master'
...
Update email_spec to 2.2.0
Closes #46845
See merge request gitlab-org/gitlab-ce!19164
2018-06-04 15:48:27 +00:00
7350eb1fa8
Add ability to search wiki titles
2018-06-04 11:41:37 +00:00
d46c12290d
Replace have_html_espaced_body_text after 517598ba
2018-06-03 22:29:51 +09:00
b02b2602c1
Merge branch 'master' into per-project-pipeline-iid
2018-06-02 11:15:53 +09:00
840f80d48b
Add validation to webhook and service URLs to ensure they are not blocked because of SSRF
2018-06-01 11:43:53 +00:00
c89e57842e
Use shared examples for populate spec
2018-06-01 15:46:15 +09:00
c754b6937c
Clean up presence validation spec
2018-06-01 15:37:36 +09:00
272b8dca80
Merge branch 'master' into per-project-pipeline-iid
2018-06-01 14:32:40 +09:00
8ed12efecd
Add merge requests list endpoint for groups
2018-05-31 15:29:07 +00:00
Toon Claes
Bob Van Landuyt
Kia Mei Somabes
Jarka Kadlecová
Mark Chao
Lin Jen-Shin
Mayra Cabrera
Kamil Trzciński
Shinya Maeda
Sean McGivern
Jan Provaznik
Chantal Rollison
Rémy Coutable
Robert Speicher
Douglas Barbosa Alexandre
Jasper Maes
Luke Bennett
Felipe Artur
Mario de la Ossa
Micaël Bergeron
Robert Speicher
Francisco Javier López
Takuya Noguchi