Merge branch 'master' of gitote.in:gitote/gitote

.gitlab-ci.yml

@@ -12,7 +12,6 @@ stages:
     - commands
     - image-test
     - pre-test-source
-    - deploy
 
 Build:
     image: golang:alpine
@@ -20,7 +19,7 @@ Build:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - make build
 
@@ -30,7 +29,7 @@ Build Dev:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - make build-dev
 
@@ -43,7 +42,7 @@ Build Dev Race:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - make build-dev-race
 
@@ -56,31 +55,19 @@ Build Prod:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - wget https://gitlab.com/gitote/bindata/raw/master/go-bindata
         - make bindata
         - make build
 
-Docker Build:
-    image: docker:latest
-    stage: build
-    services:
-      - docker:dind
-    script:
-        - mkdir -p $GOPATH/src/gitote
-        - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
-        - cd gitote
-        - docker build -t gitote .
-
 Compile LESS:
     image: golang:alpine
     stage: prepare
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - make less
 
@@ -90,7 +77,7 @@ Bindata:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - wget https://gitlab.com/gitote/bindata/raw/master/go-bindata
         - make bindata
@@ -104,7 +91,7 @@ Test:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - go test -v -cover -race ./...
 
@@ -114,7 +101,7 @@ Go LOC:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - go get -u github.com/hhatto/gocloc/cmd/gocloc
         - gocloc .
@@ -125,7 +112,7 @@ Clean:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - make clean
 
@@ -135,7 +122,7 @@ Admin:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - go build
         - ./gitote admin
@@ -146,7 +133,7 @@ Hook:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - go build
         - ./gitote hook
@@ -157,7 +144,7 @@ Import:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - go build
         - ./gitote import
@@ -168,7 +155,7 @@ Cert:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - go build
         - ./gitote cert --help
@@ -179,7 +166,7 @@ Serv:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - go build
         - ./gitote serv --help
@@ -190,26 +177,7 @@ Running:
     script:
         - mkdir -p $GOPATH/src/gitote
         - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
+        - git clone https://gitlab.com/$CI_PROJECT_PATH.git gitote
         - cd gitote
         - go build
         - ./gitote web & sleep 20 ; kill $! || echo $?
-
-Deploy Beta:
-    image: golang:latest
-    before_script:
-        - apt-get update -qq
-        - apt-get install -y sshpass
-    stage: deploy
-    script:
-        - mkdir -p $GOPATH/src/gitote
-        - cd $GOPATH/src/gitote
-        - git clone https://gitlab.com/$CI_PROJECT_PATH.git
-        - echo "Soon"
-        - echo "Deploying to beta server"
-        - sshpass
-        - export SSHPASS=$USER_PASS 
-        #- sshpass -e scp -o stricthostkeychecking=no -r . root@142.93.212.225:go/src/gitote/gitote
-    only:
-      - master
-

README.md

@@ -1,5 +1,6 @@
 # Gitote
 
+[![Buils](https://gitlab.com/gitote/mirror/badges/master/pipeline.svg)](https://gitlab.com/gitote/mirror/commits/master)
 [![Go Report](https://goreportcard.com/badge/gitote.in/gitote/gitote)](https://goreportcard.com/report/gitote.in/gitote/gitote)
 [![Bountysource](https://img.shields.io/bountysource/team/gitote/activity.svg)](https://www.bountysource.com/teams/gitote)
 [![Website Status](https://img.shields.io/website-up-down-green-red/http/gitote.in.svg?label=status)](https://gitote.in)
@@ -18,7 +19,7 @@ We expect contributors to abide by our underlying [code of conduct](CONDUCT.md).
 
 ### Where to contribute
 
-When in doubt, ask a [core team member](#core-team)! You can mention us in any issues . Any issue with ~7579403 tag is typically a good place to start.
+When in doubt, ask a [core team member](#core-team)! You can mention us in any issues . Any issue with [`Good first Issue`](https://gitote.in/gitote/gitote/issues?labels=9) tag is typically a good place to start.
 
 **Refactoring** code, e.g. improving the code without modifying the behavior is an area that can probably be done based on intuition and may not require much communication to be merged.
 
@@ -28,7 +29,7 @@ When in doubt, ask a [core team member](#core-team)! You can mention us in any i
 
 ### How to contribute
 
-1.  Fork the project & clone locally. Follow the initial setup [here](#getting-started).
+1.  Fork the project & clone locally. Follow the initial setup [here](docs/INSTALLATION.md).
 2.  Create a branch, naming it either a feature or bug: `git checkout -b feature/that-new-feature` or `bug/fixing-that-bug`
 3.  Code and commit your changes. Bonus points if you write a [good commit message](https://chris.beams.io/posts/git-commit/): `git commit -m 'Add some feature'`
 4.  Push to the branch: `git push origin feature/that-new-feature`
@@ -48,11 +49,11 @@ Some existing code may be poorly written or untested, so we must have more scrut
 
 #### Create a pull request
 
-* Try to keep the megre requests small. A megre request should try its very best to address only a single concern.
+* Try to keep the pull requests small. A pull request should try its very best to address only a single concern.
 * Make sure all tests pass and add additional tests for the code you submit.
 * Document your reasoning behind the changes. Explain why you wrote the code in the way you did. The code should explain what it does.
-* If there's an existing issue related to the megre request, reference to it by adding something like `References/Closes/Fixes/Resolves #305`, where 305 is the issue number. [More info here](https://docs.gitlab.com/ee/user/project/issues/closing_issues.html#via-merge-request)
-* If you follow the megre request template, you can't go wrong.
+* If there's an existing issue related to the pull request, reference to it by adding something like `References/Closes/Fixes/Resolves #305`, where 305 is the issue number.
+* If you follow the pull request template, you can't go wrong.
 
 ## Codebase
 
@@ -100,13 +101,13 @@ Additional technologies and services are listed on [our stackshare](https://stac
 ## Sponsors
 
 <p>
-  <a href="https://browserstack.com" target="_blank">
+  <a href="https://browserstack.com?utm_source=Gitote" target="_blank">
     <img height="50px" src="https://cdn.jsdelivr.net/npm/gitote@1.1.7/img/sponsors/browserstack.png">
   </a>
 </p>
 <br/>
 <p>
-  <a href="https://www.digitalocean.com?utm_medium=opensource&utm_source=Gitote">
+  <a href="https://m.do.co/c/1ddec8d50826">
     <img height="50px" src="https://cdn.jsdelivr.net/npm/gitote@1.1.7/img/sponsors/digitalocean.png">
   </a>
 </p>

public/robots.txt

@@ -6,7 +6,7 @@ Disallow: /
 
 User-agent: Googlebot
 Allow: /
-Disallow: /admin/*
+Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/archive/
@@ -14,7 +14,7 @@ Disallow: /*/*/raw/*
 
 User-agent: duckduckbot
 Allow: /
-Disallow: /admin/*
+Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/archive/
@@ -22,7 +22,7 @@ Disallow: /*/*/raw/*
 
 User-agent: HTTrack
 Allow: /
-Disallow: /admin/*
+Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/archive/
@@ -30,7 +30,7 @@ Disallow: /*/*/raw/*
 
 User-agent: ia_archiver
 Allow: /
-Disallow: /admin/*
+Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/archive/
@@ -38,7 +38,7 @@ Disallow: /*/*/raw/*
 
 User-agent: msnbot
 Allow: /
-Disallow: /admin/*
+Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/archive/
@@ -46,7 +46,7 @@ Disallow: /*/*/raw/*
 
 User-agent: Bingbot
 Allow: /
-Disallow: /admin/*
+Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/archive/
@@ -54,7 +54,7 @@ Disallow: /*/*/raw/*
 
 User-agent: naverbot
 Allow: /
-Disallow: /admin/*
+Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/archive/
@@ -62,7 +62,7 @@ Disallow: /*/*/raw/*
 
 User-agent: Slurp
 Allow: /
-Disallow: /admin/*
+Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/archive/
@@ -70,7 +70,7 @@ Disallow: /*/*/raw/*
 
 User-agent: Swiftbot
 Allow: /
-Disallow: /admin/*
+Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/archive/
@@ -78,7 +78,7 @@ Disallow: /*/*/raw/*
 
 User-agent: Twitterbot
 Allow: /
-Disallow: /admin/*
+Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/archive/
@@ -86,7 +86,7 @@ Disallow: /*/*/raw/*
 
 User-agent: Yandex
 Allow: /
-Disallow: /admin/*
+Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/archive/

templates/base/head.tmpl

@@ -91,7 +91,7 @@
 	}
  	</script>
  	
- 	{{template "base/ga" .}}
+ 	{{template "base/verification" .}}
 
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.AreYouSure/1.9.0/jquery.are-you-sure.min.js"></script>

templates/base/ga.tmpl

@@ -1,3 +1,4 @@
+<!-- Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-107259345-2"></script>
 <script>
   window.dataLayer = window.dataLayer || [];