Skip to content

Commit b6ea248

Browse files
tmcgilchristmtelvers
authored andcommitted
Remove GitLab references in web-ui documentation
Clean up other references in README.md and developer documentation.
1 parent 5543235 commit b6ea248

7 files changed

Lines changed: 9 additions & 39 deletions

File tree

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ If you want to build the whole system, the easiest way is using Docker:
6363

6464
```sh
6565
docker build -f Dockerfile -t ocaml-ci-service .
66-
docker build -f Dockerfile.gitlab -t ocaml-ci-gitlab .
6766
docker build -f Dockerfile.web -t ocaml-ci-web .
6867
```
6968

@@ -136,7 +135,7 @@ $ ocaml-ci mirage/irmin pull/867 alpine-3.10-ocaml-4.08 cancel
136135

137136
## Deployment
138137

139-
`ocaml-ci` is deployed as three docker images built from `Dockerfile`, `Dockerfile.gitlab` and `Dockerfile.web`, with
138+
`ocaml-ci` is deployed as two docker images built from `Dockerfile` and `Dockerfile.web`, with
140139
the live service following `live-engine` for the backend and `live-www` for the frontend.
141140
An ocurrent-deployer [pipeline](deploy.ci.dev) watches these branches, performing a docker build
142141
and deploy whenever it sees a new commit. The live branches should typically contain commits from `master` plus potentially

doc/gitlab-dev.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

web-ui/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ These are some principles for `web-ui` that we will hold to:
1313
There should be no template or markup related code here.
1414
- Routes are in `web-ui/router.ml` -- these call controllers.
1515
- Concerns related to serialising and deserialising to JSON are in `representation`
16-
- A `Git_forge` functorises controllers and views allowing for implementation of GitHub and GitLab git-forges.
16+
- A `Git_forge` functorises controllers and views allowing for implementation of git-forges (currently GitHub).
1717

1818

1919
The dependencies in web-ui are described below:

web-ui/view/documentation.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ let user_guide website_scheme_and_domain =
278278
txt
279279
" : An organisation that owns projects that they want to \
280280
build. This typically corresponds to an account on GitHub \
281-
or GitLab for example.";
281+
for example.";
282282
];
283283
p
284284
[

web-ui/view/documentation/build_page.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ let show =
1212
repository's health following the additional changes introduced by \
1313
the commit. It shows the overall status as well as an overview of \
1414
the steps that constitute the build. When examining a commit on \
15-
GitHub or GitLab, clicking on the commit's build status will bring \
16-
you to this page.";
15+
GitHub, clicking on the commit's build status will bring you to \
16+
this page.";
1717
];
1818
img
1919
~a:[ a_class [ "border border-solid" ] ]

web-ui/view/documentation/index_page.ml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,11 @@ let show =
1717
[
1818
txt
1919
"The index page of OCaml-CI lists all organisations that OCaml-CI \
20-
knows about, across both GitHub and GitLab. The logo of the Git \
21-
forge is used to indicate the source of the organisation. Note that \
22-
if no repositories are registered with OCaml-CI, the organisation \
23-
will not be listed.";
20+
knows about. Note that if no repositories are registered with \
21+
OCaml-CI, the organisation will not be listed.";
2422
];
2523
img
2624
~a:[ a_class [ "border border-solid" ] ]
2725
~src:"/images/index-page-overview.png" ~alt:"index-page-overview" ();
28-
p
29-
[
30-
txt
31-
"A filter is provided to select between GitHub or GitLab. Search is \
32-
also available.";
33-
];
34-
img
35-
~a:[ a_class [ "border border-solid" ] ]
36-
~src:"/images/index-page-search.png" ~alt:"index-page-search" ();
3726
p [ txt "To see its repositories, click on the organisation." ];
3827
]

web-ui/view/documentation/user_guide.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ let concepts_and_terms =
130130
[
131131
strong [ txt "Git forge" ];
132132
txt
133-
" : A service that hosts Git repositories. Currently GitHub and \
134-
GitLab are supported.";
133+
" : A service that hosts Git repositories. Currently GitHub is \
134+
supported.";
135135
];
136136
p
137137
[

0 commit comments

Comments
 (0)