Skip to content
Snippets Groups Projects
Commit 86f2dd4d authored by Hugo NOUTS's avatar Hugo NOUTS
Browse files

Merge branch 'dev' into 'master'

fix(typo): écogestes + optionnel poll

See merge request web-et-numerique/llle_project/backoffice-client!24
parents da02f448 122e92d7
No related branches found
No related tags found
1 merge request!24fix(typo): écogestes + optionnel poll
Pipeline #20596 passed
...@@ -42,6 +42,7 @@ sonarqube: ...@@ -42,6 +42,7 @@ sonarqube:
only: only:
- dev - dev
- merge_requests - merge_requests
when: manual
image: registry.forge.grandlyon.com/apoyen2/sonnar-scanner-gl:master image: registry.forge.grandlyon.com/apoyen2/sonnar-scanner-gl:master
before_script: before_script:
- export NODE_PATH=$NODE_PATH:`npm root -g` - export NODE_PATH=$NODE_PATH:`npm root -g`
...@@ -58,4 +59,3 @@ sonarqube: ...@@ -58,4 +59,3 @@ sonarqube:
-Dsonar.login=${SONAR_TOKEN} -Dsonar.login=${SONAR_TOKEN}
-Dsonar.cpd.exclusions=tests/**,src/**/*.spec.ts* -Dsonar.cpd.exclusions=tests/**,src/**/*.spec.ts*
-Dsonar.qualitygate.wait=true -Dsonar.qualitygate.wait=true
...@@ -22,7 +22,7 @@ const CustomLink: React.FC<EcolyoLinkProps> = ({ ...@@ -22,7 +22,7 @@ const CustomLink: React.FC<EcolyoLinkProps> = ({
link: 'consumption', link: 'consumption',
}, },
{ {
displayTitle: 'Ecogestes', displayTitle: 'Écogestes',
link: 'ecogestures', link: 'ecogestures',
}, },
{ {
......
...@@ -31,7 +31,7 @@ const Poll: React.FC<PollProps> = ({ ...@@ -31,7 +31,7 @@ const Poll: React.FC<PollProps> = ({
return ( return (
<div className="poll"> <div className="poll">
<h2>Ajouter un sondage</h2> <h2>Ajouter un sondage (Optionnel)</h2>
<p className="title">Lien</p> <p className="title">Lien</p>
<input <input
type="text" type="text"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment