Skip to content

Commit a56d9f0

Browse files
hamir-suspecthamir-suspect
committed
Merge branch 'main' into has/service-accounts
2 parents 9fb3b71 + 1658f4a commit a56d9f0

File tree

13 files changed

+695
-253
lines changed

13 files changed

+695
-253
lines changed

‎docs/docs/reference/api.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,8 @@ curl -H "Authorization: Token {api_token}" \
580580

581581
## Tasks {#tasks}
582582

583+
### Trigger a taks
584+
583585
[Tasks](../using-semaphore/tasks) can be triggered via the API.
584586

585587
To trigger a task with its default parameters:
@@ -735,9 +737,9 @@ curl -H "Authorization: Token {api_token}" \
735737

736738

737739

738-
### Self-hosted agent types
740+
## Self-hosted agent types
739741

740-
#### Listing agent types
742+
### Listing agent types
741743

742744
```text
743745
GET <organization-url>.semaphoreci.com/api/v1alpha/self_hosted_agent_types
@@ -800,7 +802,7 @@ curl -i \
800802

801803

802804

803-
#### Create an agent type
805+
### Create an agent type
804806

805807
```text
806808
POST <organization-url>.semaphoreci.com/api/v1alpha/self_hosted_agent_types
@@ -855,7 +857,7 @@ curl -i \
855857

856858

857859

858-
#### Update an agent type
860+
### Update an agent type
859861

860862
```text
861863
PATCH <organization-url>.semaphoreci.com/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -908,7 +910,7 @@ curl -X PATCH -i \
908910
```
909911

910912

911-
#### Describe an agent type
913+
### Describe an agent type
912914

913915
```text
914916
GET <organization-url>.semaphoreci.com/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -951,7 +953,7 @@ curl -i \
951953

952954

953955

954-
#### Delete an agent type
956+
### Delete an agent type
955957

956958
```text
957959
DELETE <organization-url>.semaphoreci.com/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -978,7 +980,7 @@ curl -i -X DELETE \
978980

979981

980982

981-
#### Disable agents for an agent type
983+
### Disable agents for an agent type
982984

983985
```text
984986
POST <organization-url>.semaphoreci.com/api/v1alpha/self_hosted_agent_types/:agent_type_name/disable_all
@@ -1005,9 +1007,9 @@ curl -i \
10051007
"https://<organization-url>.semaphoreci.com/api/v1alpha/self_hosted_agent_types/s1-aws-small/disable_all"
10061008
```
10071009

1008-
### Self-hosted agents
1010+
## Self-hosted agents
10091011

1010-
#### List agents for an agent type
1012+
### List agents for an agent type
10111013

10121014
```text
10131015
GET <organization-url>.semaphoreci.com/api/v1alpha/agents?agent_type=:agent_type&page_size=:page_size&cursor=:cursor

‎docs/versioned_docs/version-CE-1.1/reference/api.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,8 @@ curl -i -X POST \
472472

473473
## Tasks {#tasks}
474474

475+
### Trigger a taks
476+
475477
[Tasks](../using-semaphore/tasks) can be triggered via the API.
476478

477479
To trigger a task with its default parameters:
@@ -624,9 +626,9 @@ curl -H "Authorization: Token {api_token}" \
624626
"https://<semaphore-server-url>/api/v1alpha/logs/:job_id"
625627
```
626628

627-
### Self-hosted agent types
629+
## Self-hosted agent types
628630

629-
#### Listing agent types
631+
### Listing agent types
630632

631633
```text
632634
GET <semaphore-server-url>/api/v1alpha/self_hosted_agent_types
@@ -687,7 +689,7 @@ curl -i \
687689
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types"
688690
```
689691

690-
#### Create an agent type
692+
### Create an agent type
691693

692694
```text
693695
POST <semaphore-server-url>/api/v1alpha/self_hosted_agent_types
@@ -740,7 +742,7 @@ curl -i \
740742
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types"
741743
```
742744

743-
#### Update an agent type
745+
### Update an agent type
744746

745747
```text
746748
PATCH <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -792,7 +794,7 @@ curl -X PATCH -i \
792794
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
793795
```
794796

795-
#### Describe an agent type
797+
### Describe an agent type
796798

797799
```text
798800
GET <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -833,7 +835,7 @@ curl -i \
833835
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
834836
```
835837

836-
#### Delete an agent type
838+
### Delete an agent type
837839

838840
```text
839841
DELETE <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -858,7 +860,7 @@ curl -i -X DELETE \
858860
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
859861
```
860862

861-
#### Disable agents for an agent type
863+
### Disable agents for an agent type
862864

863865
```text
864866
POST <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name/disable_all
@@ -885,9 +887,9 @@ curl -i \
885887
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small/disable_all"
886888
```
887889

888-
### Self-hosted agents
890+
## Self-hosted agents
889891

890-
#### List agents for an agent type
892+
### List agents for an agent type
891893

892894
```text
893895
GET <semaphore-server-url>/api/v1alpha/agents?agent_type=:agent_type&page_size=:page_size&cursor=:cursor

‎docs/versioned_docs/version-CE-1.2/reference/api.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,8 @@ curl -i -X POST \
472472

473473
## Tasks {#tasks}
474474

475+
### Trigger a taks
476+
475477
[Tasks](../using-semaphore/tasks) can be triggered via the API.
476478

477479
To trigger a task with its default parameters:
@@ -624,9 +626,9 @@ curl -H "Authorization: Token {api_token}" \
624626
"https://<semaphore-server-url>/api/v1alpha/logs/:job_id"
625627
```
626628

627-
### Self-hosted agent types
629+
## Self-hosted agent types
628630

629-
#### Listing agent types
631+
### Listing agent types
630632

631633
```text
632634
GET <semaphore-server-url>/api/v1alpha/self_hosted_agent_types
@@ -687,7 +689,7 @@ curl -i \
687689
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types"
688690
```
689691

690-
#### Create an agent type
692+
### Create an agent type
691693

692694
```text
693695
POST <semaphore-server-url>/api/v1alpha/self_hosted_agent_types
@@ -740,7 +742,7 @@ curl -i \
740742
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types"
741743
```
742744

743-
#### Update an agent type
745+
### Update an agent type
744746

745747
```text
746748
PATCH <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -792,7 +794,7 @@ curl -X PATCH -i \
792794
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
793795
```
794796

795-
#### Describe an agent type
797+
### Describe an agent type
796798

797799
```text
798800
GET <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -833,7 +835,7 @@ curl -i \
833835
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
834836
```
835837

836-
#### Delete an agent type
838+
### Delete an agent type
837839

838840
```text
839841
DELETE <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -858,7 +860,7 @@ curl -i -X DELETE \
858860
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
859861
```
860862

861-
#### Disable agents for an agent type
863+
### Disable agents for an agent type
862864

863865
```text
864866
POST <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name/disable_all
@@ -885,9 +887,9 @@ curl -i \
885887
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small/disable_all"
886888
```
887889

888-
### Self-hosted agents
890+
## Self-hosted agents
889891

890-
#### List agents for an agent type
892+
### List agents for an agent type
891893

892894
```text
893895
GET <semaphore-server-url>/api/v1alpha/agents?agent_type=:agent_type&page_size=:page_size&cursor=:cursor

‎docs/versioned_docs/version-CE/reference/api.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,8 @@ curl -i -X POST \
472472

473473
## Tasks {#tasks}
474474

475+
### Trigger a taks
476+
475477
[Tasks](../using-semaphore/tasks) can be triggered via the API.
476478

477479
To trigger a task with its default parameters:
@@ -624,9 +626,9 @@ curl -H "Authorization: Token {api_token}" \
624626
"https://<semaphore-server-url>/api/v1alpha/logs/:job_id"
625627
```
626628

627-
### Self-hosted agent types
629+
## Self-hosted agent types
628630

629-
#### Listing agent types
631+
### Listing agent types
630632

631633
```text
632634
GET <semaphore-server-url>/api/v1alpha/self_hosted_agent_types
@@ -687,7 +689,7 @@ curl -i \
687689
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types"
688690
```
689691

690-
#### Create an agent type
692+
### Create an agent type
691693

692694
```text
693695
POST <semaphore-server-url>/api/v1alpha/self_hosted_agent_types
@@ -740,7 +742,7 @@ curl -i \
740742
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types"
741743
```
742744

743-
#### Update an agent type
745+
### Update an agent type
744746

745747
```text
746748
PATCH <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -792,7 +794,7 @@ curl -X PATCH -i \
792794
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
793795
```
794796

795-
#### Describe an agent type
797+
### Describe an agent type
796798

797799
```text
798800
GET <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -833,7 +835,7 @@ curl -i \
833835
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
834836
```
835837

836-
#### Delete an agent type
838+
### Delete an agent type
837839

838840
```text
839841
DELETE <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -858,7 +860,7 @@ curl -i -X DELETE \
858860
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
859861
```
860862

861-
#### Disable agents for an agent type
863+
### Disable agents for an agent type
862864

863865
```text
864866
POST <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name/disable_all
@@ -885,9 +887,9 @@ curl -i \
885887
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small/disable_all"
886888
```
887889

888-
### Self-hosted agents
890+
## Self-hosted agents
889891

890-
#### List agents for an agent type
892+
### List agents for an agent type
891893

892894
```text
893895
GET <semaphore-server-url>/api/v1alpha/agents?agent_type=:agent_type&page_size=:page_size&cursor=:cursor

‎docs/versioned_docs/version-EE/reference/api.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,8 @@ curl -H "Authorization: Token {api_token}" \
528528

529529
## Tasks {#tasks}
530530

531+
### Trigger a taks
532+
531533
[Tasks](../using-semaphore/tasks) can be triggered via the API.
532534

533535
To trigger a task with its default parameters:
@@ -680,9 +682,9 @@ curl -H "Authorization: Token {api_token}" \
680682
"https://<semaphore-server-url>/api/v1alpha/logs/:job_id"
681683
```
682684

683-
### Self-hosted agent types
685+
## Self-hosted agent types
684686

685-
#### Listing agent types
687+
### Listing agent types
686688

687689
```text
688690
GET <semaphore-server-url>/api/v1alpha/self_hosted_agent_types
@@ -743,7 +745,7 @@ curl -i \
743745
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types"
744746
```
745747

746-
#### Create an agent type
748+
### Create an agent type
747749

748750
```text
749751
POST <semaphore-server-url>/api/v1alpha/self_hosted_agent_types
@@ -796,7 +798,7 @@ curl -i \
796798
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types"
797799
```
798800

799-
#### Update an agent type
801+
### Update an agent type
800802

801803
```text
802804
PATCH <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -848,7 +850,7 @@ curl -X PATCH -i \
848850
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
849851
```
850852

851-
#### Describe an agent type
853+
### Describe an agent type
852854

853855
```text
854856
GET <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -889,7 +891,7 @@ curl -i \
889891
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
890892
```
891893

892-
#### Delete an agent type
894+
### Delete an agent type
893895

894896
```text
895897
DELETE <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name
@@ -914,7 +916,7 @@ curl -i -X DELETE \
914916
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small"
915917
```
916918

917-
#### Disable agents for an agent type
919+
### Disable agents for an agent type
918920

919921
```text
920922
POST <semaphore-server-url>/api/v1alpha/self_hosted_agent_types/:agent_type_name/disable_all
@@ -941,9 +943,9 @@ curl -i \
941943
"https://<semaphore-server-url>/api/v1alpha/self_hosted_agent_types/s1-aws-small/disable_all"
942944
```
943945

944-
### Self-hosted agents
946+
## Self-hosted agents
945947

946-
#### List agents for an agent type
948+
### List agents for an agent type
947949

948950
```text
949951
GET <semaphore-server-url>/api/v1alpha/agents?agent_type=:agent_type&page_size=:page_size&cursor=:cursor

‎github_hooks/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ gem "sentry-rails"
3434
gem "sentry-sidekiq"
3535

3636
gem "sprockets", "< 4"
37-
gem "nokogiri", "~> 1.18.8"
37+
gem "nokogiri", "~> 1.18.9"
3838

3939
gem "rt-watchman", :require => "watchman", :github => "renderedtext/watchman", :ref => "74530687a232aea678b6738114c82dfc163657cd"
4040
gem "rt-logman", :require => "logman"

0 commit comments

Comments
 (0)