Commit Graph

65 Commits

Author SHA1 Message Date
GitLab Bot d03fff1550 Add latest changes from gitlab-org/gitlab@master 2024-10-09 06:11:15 +00:00
GitLab Bot b5dcad11be Add latest changes from gitlab-org/gitlab@master 2024-08-22 03:10:19 +00:00
GitLab Bot 863791a57b Add latest changes from gitlab-org/gitlab@master 2024-07-18 06:23:23 +00:00
GitLab Bot 991e21abb9 Add latest changes from gitlab-org/gitlab@master 2024-06-28 15:21:47 +00:00
GitLab Bot 94b0c50444 Add latest changes from gitlab-org/gitlab@master 2024-05-14 09:21:50 +00:00
GitLab Bot 35305bfc83 Add latest changes from gitlab-org/gitlab@master 2024-04-30 15:11:09 +00:00
GitLab Bot 9ee836ec2b Add latest changes from gitlab-org/gitlab@master 2024-04-15 18:11:15 +00:00
GitLab Bot de92b67d77 Add latest changes from gitlab-org/gitlab@master 2024-04-12 03:13:44 +00:00
GitLab Bot e408c9c787 Add latest changes from gitlab-org/gitlab@master 2024-03-06 12:12:50 +00:00
GitLab Bot c6a65ea473 Add latest changes from gitlab-org/gitlab@master 2024-02-05 18:10:13 +00:00
GitLab Bot 31f59b55c6 Add latest changes from gitlab-org/gitlab@master 2023-07-12 18:08:58 +00:00
GitLab Bot b6b701cf9d Add latest changes from gitlab-org/gitlab@master 2023-05-16 18:09:09 +00:00
GitLab Bot 5fe2d74e00 Add latest changes from gitlab-org/gitlab@master 2022-12-09 09:08:55 +00:00
GitLab Bot f46d20e508 Add latest changes from gitlab-org/gitlab@master 2022-06-23 12:09:30 +00:00
GitLab Bot 9a4d2a38dc Add latest changes from gitlab-org/gitlab@master 2022-06-07 21:09:00 +00:00
GitLab Bot b45d30ab76 Add latest changes from gitlab-org/gitlab@master 2020-11-07 00:08:58 +00:00
GitLab Bot da100a690f Add latest changes from gitlab-org/gitlab@master 2020-08-11 21:10:09 +00:00
GitLab Bot fa7ac2663b Add latest changes from gitlab-org/gitlab@master 2020-06-24 06:09:01 +00:00
GitLab Bot 1219a9dce9 Add latest changes from gitlab-org/gitlab@master 2020-04-01 15:07:45 +00:00
GitLab Bot c77fda905a Add latest changes from gitlab-org/gitlab@master 2020-02-27 21:09:17 +00:00
GitLab Bot e43077ab47 Add latest changes from gitlab-org/gitlab@master 2020-02-07 15:09:52 +00:00
GitLab Bot abfafe3c57 Add latest changes from gitlab-org/gitlab@master 2019-10-29 00:06:10 +00:00
blackst0ne b44a2c801a Update specs to rails5 format
Updates specs to use new rails5 format.

The old format:
`get :show, { some: params }, { some: headers }`

The new format:
`get :show, params: { some: params }, headers: { some: headers }`
2018-12-19 10:04:31 +11:00
Dmitriy Zaporozhets 464b0de1ac Merge branch 'filter-web-hooks-by-branch' into 'master'
Filter web hooks by branch

See merge request gitlab-org/gitlab-ce!19513
2018-09-05 13:39:41 +00:00
sliaquat 4157073068 Remove some duplicate tests and fix some typos 2018-08-16 16:40:03 +05:00
Duana Saskia ece6a1ea6e Filter project hooks by branch
Allow specificying a branch filter for a project hook and only trigger
a project hook if either the branch filter is blank or the branch matches.
Only supported for push_events for now.
2018-08-13 13:20:58 +02:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00: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
Jean-Baptiste Guerraz 20844326f3 align "confidential issues events" implementation with "issues events" one 2018-03-01 10:51:56 +01:00
blackst0ne 27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Jacopo 2f40dac352 Refactor `have_http_status` into `have_gitlab_http_status` in the specs 2017-10-20 10:13:18 +02:00
Robert Schilling 915dd57fe2 Add tests for the unmodified header 2017-08-28 17:10:34 +02:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Douwe Maan 1fd83f972c Merge branch 'bvl-rename-build-events-to-job-events' into 'master'
Rename `build_events` to `job_events`

Closes #31620

See merge request !11287
2017-05-16 14:12:19 +02:00
Douwe Maan 950fa32a7c Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"
This reverts merge request !11287
2017-05-15 20:24:19 +00:00
Bob Van Landuyt cac7e03fa1 Rename `build_events` to `job_events` in code 2017-05-15 14:27:01 +02:00
Jacopo ff76adb547 Unnecessary "include WaitForAjax" and "include ApiHelpers"
Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs.
Removed unnecessary usage of `api:true`
2017-04-21 22:32:02 +02:00
Z.J. van de Weg e415ad3952 Fix API not accepting job_events for webhooks
When renaming, the argument on the projects hook API was forgotten. Now
one could successfully set it again.

The fix is a little ugly stylewise, but needed as the underlying model
still refers to it as build_events. This commit is to fix it, later we
should migrate the data to a new column. The edit on the spec file makes
sure it passes now, and will fail when we migrate the column.
2017-04-12 10:06:57 +02:00
Toon Claes 9e942b5972 Fix all tests
This commit was about 6 commits before squashing, with the main goal to
make all tests green. Now, after pushing this commit we'll see what the
CI has to say about that.
2017-03-06 14:34:07 +01:00
Robert Schilling 86c58687b2 Return 204 for delete endpoints 2017-02-28 08:32:38 +01:00
Robert Schilling c70dfbc686 Add a custom pagination matcher 2017-02-16 15:38:40 +01:00
Rémy Coutable 9c560b5cdf
Replace many :project with :empty_projects in API specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-17 11:41:27 -05:00
Robert Schilling 2448fa69d6 Fix project hooks params 2017-01-03 21:07:12 +01:00
Livier eb4f15571d Changed API spec files to describe the correct class
Restore changes for api spec files

Fix error in rspec Users

Delete extra space Repositories-spec
2016-11-28 10:55:27 -07:00
Sean McGivern f77be11cb9 Ensure hook tokens are write-only in the API 2016-11-01 11:40:06 +00:00
Gauvain Pocentek c85c146aa2 Add support for token attr in project hooks API
The UI allows to define a token to validate payload on the target URL,
this patch adds the feature to the API.
2016-11-01 10:41:39 +00:00
Dmitriy Zaporozhets 137ebcfb3c Replace undefined Grape routing code from 400 to 404
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-10 16:32:32 +03:00
Dmitriy Zaporozhets fdfc93679d Fix API specs behaviour for invalid routing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-10 16:32:32 +03:00
Ben Boeckel 99c2f3b3c5 api: expose wiki_page_events project hook field in the API 2016-08-24 10:33:51 -04:00
Ben Boeckel f413d7ed80 docs: document other project webhook fields 2016-08-24 10:33:37 -04:00