Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
336
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
23
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TransFem.org
Sharkey
Commits
95959b0d
Commit
95959b0d
authored
10 months ago
by
dakkar
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'sharkey/stable' into feature/next-release
parents
f1d96b8a
3d6eb18e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!556
release 2024.5.0
,
!512
bump develop after 2024.3.3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
package.json
+1
-1
1 addition, 1 deletion
package.json
with
2 additions
and
2 deletions
.gitlab-ci.yml
+
1
−
1
View file @
95959b0d
...
...
@@ -4,7 +4,7 @@ stages:
testCommit
:
stage
:
test
image
:
node:
latest
image
:
node:
iron
services
:
-
postgres:15
-
redis
...
...
This diff is collapsed.
Click to expand it.
package.json
+
1
−
1
View file @
95959b0d
{
"name"
:
"sharkey"
,
"version"
:
"2024.3.
2-devel
"
,
"version"
:
"2024.3.
3
"
,
"codename"
:
"shonk"
,
"repository"
:
{
"type"
:
"git"
,
...
...
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