Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import docs into main repository #2874

Merged
merged 3 commits into from
Nov 26, 2017
Merged

Import docs into main repository #2874

merged 3 commits into from
Nov 26, 2017

Conversation

techknowlogick
Copy link
Member

Fixes #2865 by merging docs repo and main gitea repo.

I've removed the following files from the docs subdir as they are the same as the contents in main repo:

  • MAINTAINERS
  • CONTRIBUTING.md
  • DCO
  • and the .github directory

but I've kept the LICENSE file as it differs from the one in the main repo.

Signed-off-by: Matti Ranta <matti@mdranta.net>
@codecov-io
Copy link

codecov-io commented Nov 8, 2017

Codecov Report

Merging #2874 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2874      +/-   ##
==========================================
- Coverage   32.53%   32.51%   -0.02%     
==========================================
  Files         267      267              
  Lines       39270    39270              
==========================================
- Hits        12776    12770       -6     
- Misses      24700    24712      +12     
+ Partials     1794     1788       -6
Impacted Files Coverage Δ
models/repo_indexer.go 49% <0%> (-2.98%) ⬇️
modules/indexer/repo.go 60.86% <0%> (-2.61%) ⬇️
models/repo.go 38% <0%> (+0.18%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f148a4a...f451771. Read the comment docs.

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 8, 2017
@bkcsoft
Copy link
Member

bkcsoft commented Nov 9, 2017

LGTM

@tboerger tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Nov 9, 2017
@bkcsoft
Copy link
Member

bkcsoft commented Nov 9, 2017

This would deprecate https://github.com/go-gitea/docs/

image: plugins/docker:17.05
pull: true
secrets: [ docker_username, docker_password ]
repo: gitea/docs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not correct any more?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would still build a separate docker image just for docs that would push to https://hub.docker.com/r/gitea/docs/
See the next line where I specify the docker file found in the docs directory.
This would allow the docs on the gitea site to pull from the specific docs image.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would these secrets prevent PRs from succeeding CI ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@strk good question. These secrets are already in use from the other docker container being built.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then LGTM

@strk
Copy link
Member

strk commented Nov 26, 2017

LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Nov 26, 2017
@lafriks
Copy link
Member

lafriks commented Nov 26, 2017

@techknowlogick have you updated latest changes from docs?

@techknowlogick
Copy link
Member Author

@lafriks I'm just missing the latest commit from 5 hours ago. Let me put that in and I'll ping you when that is done. Thanks for checking.

@techknowlogick
Copy link
Member Author

@lafriks updated and drone has a successful build.

@lafriks lafriks added the type/docs This PR mainly updates/creates documentation label Nov 26, 2017
@lafriks lafriks merged commit fb5c6b6 into go-gitea:master Nov 26, 2017
@lafriks
Copy link
Member

lafriks commented Nov 27, 2017

@techknowlogick docs docker build fails with lstat docker/caddy.conf: no such file or directory see https://drone.gitea.io/go-gitea/gitea/2024/17

@techknowlogick
Copy link
Member Author

techknowlogick commented Nov 27, 2017 via email

@techknowlogick
Copy link
Member Author

@lafriks I submitted a fix to #2989

@lunny lunny added this to the 1.4.0 milestone Nov 27, 2017
lafriks pushed a commit that referenced this pull request Nov 27, 2017
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/docs This PR mainly updates/creates documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Proposal: Merge docs into this repo
7 participants