Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mat2-quasar-frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jfriedli
mat2-quasar-frontend
Commits
caaaeb66
Commit
caaaeb66
authored
10 months ago
by
jfriedli
Browse files
Options
Downloads
Patches
Plain Diff
move from master to main
parent
d11a87d5
Branches
main
Branches containing commit
Tags
v1.8.6
1 merge request
!1285
v1.8.6
Pipeline
#297498
passed
15 hours ago
Stage: build
Stage: container_build
Stage: test
Stage: renovate
Changes
2
Pipelines
320
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
README.md
+3
-3
3 additions, 3 deletions
README.md
with
5 additions
and
5 deletions
.gitlab-ci.yml
+
2
−
2
View file @
caaaeb66
...
...
@@ -64,7 +64,7 @@ build_frontend_with_placeholder_url:
variables
:
MAT2_API_URL_PROD
:
'
$MAT_API_HOST_PLACEHOLDER'
only
:
-
ma
ster
-
ma
in
-
develop
-
schedules
-
tags
...
...
@@ -96,7 +96,7 @@ build_frontend_with_placeholder_url:
build_container
:
<<
:
*container-build-template
only
:
-
ma
ster
-
ma
in
-
develop
build_tagged_container
:
...
...
This diff is collapsed.
Click to expand it.
README.md
+
3
−
3
View file @
caaaeb66
...
...
@@ -36,7 +36,7 @@ The following variables are **optional** and must match the API configuration.
**Registry Backend:**
https://0xacab.org/jvoisin/mat2-web/container_registry
You can find the config env variables above.
A minimal example taken from a
[
docker-compose.yml
](
https://0xacab.org/jfriedli/mat2-web-demo/-/blob/ma
ster
/docker-compose.yml
)
A minimal example taken from a
[
docker-compose.yml
](
https://0xacab.org/jfriedli/mat2-web-demo/-/blob/ma
in
/docker-compose.yml
)
```
yaml
version
:
'
3'
...
...
@@ -74,13 +74,13 @@ When it's done you'll make a merge request for from your branch into the `develo
| Branch | Description |
| ---------|:-------------:|
| Develop | The develop branch MIGHT contain non
*
operational code |
| Ma
ster
| The
Master
branch MUST contain
*
operational code |
| Ma
in
| The
main
branch MUST contain
*
operational code |
*
operational: This means the code itself contains only working features and finished
tasks that have been tested and are known to be working.
### Tags
We do use tags to mark releases. A tag SHOULD reference the ma
ster
branch.
We do use tags to mark releases. A tag SHOULD reference the ma
in
branch.
On tag creation you have to submit a changelog.
### Configuration
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment