summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-05-09 02:33:28 +0000
committerStan Hu <stanhu@gmail.com>2016-05-09 02:33:28 +0000
commit3ea6fc1eefbc958b10110bb8a947a30c8fc8c3ea (patch)
treef5c0aae213908b99f6668d0f285a0e54d4d6b5b0
parent9bf99423613caeff16a548632de2c8241c09f404 (diff)
parentcd1faeef634a04a2bdbeef502ac62a210e58cb84 (diff)
downloadgitlab-shell-3ea6fc1eefbc958b10110bb8a947a30c8fc8c3ea.tar.gz
Merge branch 'fix-spelling-mistakes' into 'master'
Fix spelling mistakes in README.md See merge request !57
-rw-r--r--README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index ccedbf0..a779998 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ When you access the GitLab server over ssh then GitLab Shell will:
1. Limits you to predefined git commands (git push, git pull, git annex).
1. Call the GitLab Rails API to check if you are authorized
1. It will execute the pre-receive hooks (called Git Hooks in GitLab Enterprise Edition)
-1. It will excute the action you requested
+1. It will execute the action you requested
1. Process the GitLab post-receive actions
1. Process any custom post-receive actions
@@ -34,7 +34,7 @@ The authorization checks for git pull are much simpler since you only have to ch
An overview of the four cases described above:
1. git pull over ssh -> gitlab-shell -> API call to gitlab-rails (Authorization) -> accept or decline -> execute git command
-1. git pull over http -> gitlab-rails (AUthorization) -> accept or decline -> execute git command
+1. git pull over http -> gitlab-rails (Authorization) -> accept or decline -> execute git command
1. git push over ssh -> gitlab-shell (git command is not executed yet) -> execute git command -> gitlab-shell pre-receive hook -> API call to gitlab-rails (authorization) -> accept or decline push
1. git push over http -> gitlab-rails (git command is not executed yet) -> execute git command -> gitlab-shell pre-receive hook -> API call to gitlab-rails (authorization) -> accept or decline push