Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
memopol
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
32
Issues
32
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Political Memory
memopol
Commits
6b344a13
Commit
6b344a13
authored
Oct 08, 2016
by
okhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of git.laquadrature.net:political-memory/political_memory
parents
7b41f48b
f28af967
Pipeline
#135
failed
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
docs/development.rst
docs/development.rst
+2
-2
src/memopol/bin/install_client_deps.sh
src/memopol/bin/install_client_deps.sh
+1
-1
No files found.
docs/development.rst
View file @
6b344a13
...
...
@@ -68,7 +68,7 @@ sake of the demo, we'll use the main repository URL::
Create your own branch, ie::
$ git checkout -b yourbranch
origin/pr
$ git checkout -b yourbranch
Branch yourbranch set up to track remote branch pr from origin.
Switched to a new branch 'yourbranch'
...
...
@@ -93,7 +93,7 @@ Install client dependencies
We'll also need to download client libraries::
$ bin/install_client_deps.sh
$
src/memopol/
bin/install_client_deps.sh
* Downloading jquery/jquery (2.1.4) from Github...
* Downloading FortAwesome/Font-Awesome (v4.3.0) from Github...
* Downloading lipis/flag-icon-css (0.7.1) from Github...
...
...
src/memopol/bin/install_client_deps.sh
View file @
6b344a13
...
...
@@ -29,7 +29,7 @@ function downloadFromGithub()
return
fi
echo
"* Downloading
$repo
(
$ref
) from Github..."
wget
-O
temp.zip
-q
"https://git.laquadrature.net/
${
repo
}
/archive.sip?ref=/
${
ref
}
"
wget
-O
temp.zip
-q
https://github.com/
${
repo
}
/archive/
${
ref
}
.zip
unzip
-q
temp.zip
mv
$(
basename
${
repo
}
)
*
${
dest
}
rm
temp.zip
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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