[ARVADOS] updated: 77aeb6fdedab3d2aac25120e5a99317155c9f26e
git at public.curoverse.com
git at public.curoverse.com
Mon Jul 20 09:50:12 EDT 2015
Summary of changes:
.../app/views/users/_manage_repositories.html.erb | 1 +
apps/workbench/config/load_config.rb | 12 +++++++++---
.../test/integration/user_manage_account_test.rb | 2 ++
doc/images/add-new-repository.png | Bin 10026 -> 9575 bytes
doc/images/added-new-repository.png | Bin 0 -> 14210 bytes
.../tutorials/add-new-repository.html.textile.liquid | 10 ++++++----
.../tutorial-submit-job.html.textile.liquid | 11 +++++++++--
services/api/config/initializers/load_config.rb | 12 +++++++++---
8 files changed, 36 insertions(+), 12 deletions(-)
create mode 100644 doc/images/added-new-repository.png
via 77aeb6fdedab3d2aac25120e5a99317155c9f26e (commit)
via 94afae23dd927b2d9d6c3472f90bc00f0310bbf5 (commit)
via a1e6ebc7e1afc04e8a1de0c0bb8e304eda6ecf2c (commit)
via 706f34d335cecb9f321dda8abaf8718fa951e908 (commit)
via 9ac57b0bc6cb5d90da57c943df489401c63b7a7f (commit)
via acacdd86095218aa2bb4cc4cd564d9d7f135da3c (commit)
via db2584826ed9aadb162b8bd6d25e164565bbab8b (commit)
via c790738ae71771a5574b166b3e93a1bca9b89bf6 (commit)
via ed8897b942f147afccf8eeac1025861ffe2f1690 (commit)
via 318e3d183c3800863731a20a10f1b8bf9cc82280 (commit)
from 702ce6c3da9a1b09a2ed546fd3da775d21bd703b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 77aeb6fdedab3d2aac25120e5a99317155c9f26e
Author: radhika <radhika at curoverse.com>
Date: Mon Jul 20 09:49:32 2015 -0400
6617: add note if prompted for user name during git clone using https url.
diff --git a/doc/user/tutorials/tutorial-submit-job.html.textile.liquid b/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
index 8acf205..ee93696 100644
--- a/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
+++ b/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
@@ -37,6 +37,13 @@ Cloning into 'tutorial'...</code></pre>
This will create a Git repository in the directory called @tutorial@ in your home directory. Say yes when prompted to continue with connection.
Ignore any warning that you are cloning an empty repository.
+*Note:* If you are prompted for username and password when you try to git clone using this command, it would mean that git config needs to be updated. Execute the following commands to update your git configuration.
+
+<pre>
+git config 'credential.https://git.{{ site.arvados_api_host }}/.username' none
+git config 'credential.https://git.{{ site.arvados_api_host }}/.helper' '!cred(){ cat >/dev/null; if [ "$1" = get ]; then echo password=$ARVADOS_API_TOKEN; fi; };cred'
+</pre>
+
{% include 'notebox_begin' %}
For more information about using Git, try
commit 94afae23dd927b2d9d6c3472f90bc00f0310bbf5
Merge: acacdd8 a1e6ebc
Author: radhika <radhika at curoverse.com>
Date: Mon Jul 20 09:37:00 2015 -0400
Merge branch 'master' into 6617-display-https-url
commit acacdd86095218aa2bb4cc4cd564d9d7f135da3c
Author: radhika <radhika at curoverse.com>
Date: Fri Jul 17 14:20:53 2015 -0400
6617: update documentation to include https git url
diff --git a/doc/images/add-new-repository.png b/doc/images/add-new-repository.png
index 51c8f38..6193844 100644
Binary files a/doc/images/add-new-repository.png and b/doc/images/add-new-repository.png differ
diff --git a/doc/images/added-new-repository.png b/doc/images/added-new-repository.png
new file mode 100644
index 0000000..7d187aa
Binary files /dev/null and b/doc/images/added-new-repository.png differ
diff --git a/doc/user/tutorials/add-new-repository.html.textile.liquid b/doc/user/tutorials/add-new-repository.html.textile.liquid
index e42f129..5057fda 100644
--- a/doc/user/tutorials/add-new-repository.html.textile.liquid
+++ b/doc/user/tutorials/add-new-repository.html.textile.liquid
@@ -23,7 +23,7 @@ On the Arvados Workbench, click on the dropdown menu icon <span class="fa fa-lg
In the *Manage account* page, you will see the *Repositories* panel with the *Add new repository* button.
-!{{ site.baseurl }}/images/repositories-panel.png!
+!{display: block;margin-left: 25px;margin-right: auto;}{{ site.baseurl }}/images/repositories-panel.png!
Click the *Add new Repository* button to open the popup to add a new arvados repository. You will see a text box where you can enter the name of the repository. Enter *tutorial* in this text box and click on *Create*.
@@ -31,10 +31,12 @@ Click the *Add new Repository* button to open the popup to add a new arvados rep
The name you enter here must begin with a letter and can only contain alphanumeric characters.
{% include 'notebox_end' %}
-!{{ site.baseurl }}/images/add-new-repository.png!
+!{display: block;margin-left: 25px;margin-right: auto;border:1px solid lightgray;}{{ site.baseurl }}/images/add-new-repository.png!
-This will create a new repository with the name @$USER/tutorial@ with the URL <notextile><code>git at git.{{ site.arvados_api_host }}:$USER/tutorial.git</code></notextile>
+This will create a new repository with the name @$USER/tutorial at . It can be accessed using the URL <notextile><code>https://git.{{ site.arvados_api_host }}/$USER/tutorial.git</code></notextile> or <notextile><code>git at git.{{ site.arvados_api_host }}:$USER/tutorial.git</code></notextile>
-Back in the *Repositories* panel in the *Manage account* page, you should see the @$USER/tutorial@ repository listed in the name column with the URL <notextile><code>git at git.{{ site.arvados_api_host }}:$USER/tutorial.git</code></notextile>.
+Back in the *Repositories* panel in the *Manage account* page, you should see the @$USER/tutorial@ repository listed in the name column with these URLs.
+
+!{display: block;margin-left: 25px;margin-right: auto;}{{ site.baseurl }}/images/added-new-repository.png!
You are now ready to use this *tutorial* repository to run your crunch scripts.
diff --git a/doc/user/tutorials/tutorial-submit-job.html.textile.liquid b/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
index de60784..8acf205 100644
--- a/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
+++ b/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
@@ -24,13 +24,13 @@ All Crunch scripts are managed through the Git revision control system. Before
On the Arvados Workbench, click on the dropdown menu icon <span class="fa fa-lg fa-user"></span> <span class="caret"></span> in the upper right corner of the top navigation menu to access the user settings menu, and click on the menu item *Manage account* to go to the account management page.
-On the *Manage account* page, you will see *Repositories* panel. In this panel, you should see the @$USER/tutorial@ repository listed in the *name* column. Next to *name* is the column *URL*. Copy the *URL* value associated with your repository. This should look like <notextile><code>git at git.{{ site.arvados_api_host }}:$USER/tutorial.git</code></notextile>.
+On the *Manage account* page, you will see *Repositories* panel. In this panel, you should see the @$USER/tutorial@ repository listed in the *name* column. Next to *name* is the column *URL*. Copy the *URL* value associated with your repository. This should look like <notextile><code>https://git.{{ site.arvados_api_host }}/$USER/tutorial.git</code></notextile>. Alternatively, you can use <notextile><code>git at git.{{ site.arvados_api_host }}:$USER/tutorial.git</code></notextile>
Next, on the Arvados virtual machine, clone your Git repository:
<notextile>
<pre><code>~$ <span class="userinput">cd $HOME</span> # (or wherever you want to install)
-~$ <span class="userinput">git clone git at git.{{ site.arvados_api_host }}:$USER/tutorial.git</span>
+~$ <span class="userinput">git clone https://git.{{ site.arvados_api_host }}/$USER/tutorial.git</span>
Cloning into 'tutorial'...</code></pre>
</notextile>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list