Commit graph

23 commits

Author SHA1 Message Date
GitLab Bot
930ff68c1e Add latest changes from gitlab-org/gitlab@master 2019-09-16 18:06:05 +00:00
GitLab Bot
b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Jan Provaznik
4189ffe214 Added labels_hook_attrs method
Based on review comment fetching labels hook_attrs is now
wrapped in an issue's model method.
2019-06-24 11:51:34 +02:00
Sean McGivern
da4702493d Fix label serialisation in issue and note hooks
We were not calling hook_attrs on the labels correctly. Specs were
passing because the issues under test did not have any labels!
2019-06-20 13:50:28 +01:00
Sujay Patel
ed8a00b9c4 Adding labels to note event payload. 2019-06-10 15:35:38 +05:30
Oswaldo Ferreira
ca884980ee [CE] Support multiple assignees for merge requests
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
2019-04-08 18:40:00 -03:00
Yorick Peterse
96eefa7f28
Fix whitespace in IssueBuilder/MergeRequestBuilder 2019-03-15 17:25:40 +01:00
gfyoung
7ec8af5017 Enable even more frozen string for lib/gitlab
Enables frozen string for the following:

* lib/gitlab/hook_data/**/*.rb
* lib/gitlab/i18n/**/*.rb
* lib/gitlab/import/**/*.rb
* lib/gitlab/import_export/**/*.rb
* lib/gitlab/kubernetes/**/*.rb
* lib/gitlab/legacy_github_import/**/*.rb
* lib/gitlab/manifest_import/**/*.rb
* lib/gitlab/metrics/**/*.rb
* lib/gitlab/middleware/**/*.rb

Partially addresses gitlab-org/gitlab-ce#47424.
2018-11-16 17:41:14 -08:00
Sean McGivern
0bcfd0adb3 Fix image webhook rewriting for uploads
This rewrote URLs to be absolute URLs. However, for uploads (the most
common case), we actually need them to point to not just the GitLab
instance, but the project they're from. Thankfully, we can normally get
that information from the object we're building the hook for.
2018-10-16 10:54:49 +01:00
Chantal Rollison
28ab966210 Port of ccr/6274/add_weight_to_payload to CE 2018-08-21 07:32:17 +00:00
Sean McGivern
fc580935ca Keep #absolute_image_urls as a private instance method 2018-07-17 14:58:14 +01:00
Sean McGivern
25664f89ac Don't include a double slash when rewriting the URL 2018-07-06 13:44:45 +01:00
Sean McGivern
0d9ef34a25 Add documentation and specs for webhook URL rewriting 2018-07-06 11:35:30 +01:00
Sean McGivern
7ff24772b6 Add base class for hook builders, and use it for notes and wikis 2018-06-20 15:52:16 +01:00
Sean McGivern
95265c0821 Fix MR hook builder 2018-06-20 14:13:24 +01:00
Satish Perala
9170aab92e Passing absolute image urls in the markdown content in the webhooks 2018-06-20 14:13:23 +01:00
Douwe Maan
52967b107b
Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'security-10-6'
[10.6] Prevent notes on confidential issues from being sent to chat

See merge request gitlab/gitlabhq!2366
# Conflicts:
#	app/helpers/services_helper.rb
2018-04-05 08:41:56 +02:00
Yorick Peterse
d0b8f536a1
Remove soft removals related code
This removes all usage of soft removals except for the "pending delete"
system implemented for projects. This in turn simplifies all the query
plans of the models that used soft removals. Since we don't really use
soft removals for anything useful there's no point in keeping it around.

This _does_ mean that hard removals of issues (which only admins can do
if I'm not mistaken) can influence the "iid" values, but that code is
broken to begin with. More on this (and how to fix it) can be found in
https://gitlab.com/gitlab-org/gitlab-ce/issues/31114.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
2018-01-08 17:04:45 +01:00
Rémy Coutable
05c10c9bf7 Add total_time_spent to the changes hash in issuable Webhook payloads
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-15 15:42:19 +01:00
Yorick Peterse
d825c9cb5d
Clean up schema of the "issues" table
This adds various foreign key constraints, indexes, missing NOT NULL
constraints, and changes some column types from timestamp to
timestamptz.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/31811
2017-11-09 18:00:30 +01:00
micael.bergeron
6c1c64d4bb fix the failing spec 2017-11-03 11:29:06 -04:00
Rémy Coutable
f070265a6d
Introduce new hook data builders for Issue and MergeRequest
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-09 16:44:47 +02:00
Rémy Coutable
075d651604 Start adding Gitlab::HookData::IssuableBuilder
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-09 15:07:10 +02:00