Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
groupe-calcul
website
Commits
c5bb2ef2
Commit
c5bb2ef2
authored
Jun 13, 2019
by
Matthieu Boileau
Browse files
Merge branch 'dev-boileau' into 'develop'
Quelques nettoyages See merge request
!230
parents
556bd33f
f0866e72
Pipeline
#4488
passed with stages
in 41 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
c5bb2ef2
...
...
@@ -34,12 +34,8 @@ apache-dev:
variables
:
PUBLISH_DIR
:
"
/var/www/calcul-dev/$CI_COMMIT_REF_NAME"
only
:
-
pr_branch_deploy
-
TEST-job-form
-
theme
-
develop
-
/^dev-.*$/
-
embed_twitter_v2
dependencies
:
-
build
script
:
...
...
@@ -64,18 +60,6 @@ apache:
-
rsync -av --delete content/attachments/ $PUBLISH_DIR/attachments/
-
chmod a+w $PUBLISH_DIR/job_offers/flood
update-issue
:
stage
:
post-deploy
image
:
$CI_REGISTRY_IMAGE
tags
:
-
docker
only
:
-
develop
dependencies
:
[]
script
:
-
echo "Updating issue \#49"
-
python3 utils/follow_transfer.py --issue
notify-job-offer-author
:
stage
:
post-deploy
image
:
$CI_REGISTRY_IMAGE
...
...
themes/calcul/templates/index.html
View file @
c5bb2ef2
...
...
@@ -89,7 +89,7 @@
<div
class=
"card-body py-0"
>
<h1
class=
"card-title"
>
Offres d'emploi
</h1>
<p
class=
"card-text m-0"
>
CDI, CDD, post-doc,
<br>
thèses, stages.
</p>
<a
class=
"card-link"
href=
"{{SITEURL}}/category/job.html"
>
Tous les jobs
</a>
<a
class=
"card-link"
href=
"{{
SITEURL
}}/category/job.html"
>
Tous les jobs
</a>
</div>
</div>
...
...
@@ -102,7 +102,7 @@
</div>
<div
class=
"card-body py-0"
>
<h1
class=
"card-title"
>
Evénements scientifiques
</h1>
<p
class=
"card-text m-0"
>
Thèmes du GdR lorem
<br>
ipsum dolor sit amet
.
</p>
<p
class=
"card-text m-0"
>
Recherche et veille scientifique
<br>
autour du calcul
.
</p>
<a
class=
"card-link"
href=
"{{ SITEURL }}/tag/evt_sci.html"
>
L'agenda scientifique
</a>
</div>
</div>
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment