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.

Sign up for GitHub

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

Jump to bottom

Gogs develop into Gitea release/1.7 #3

Open
wants to merge 199 commits into
base: release/v1.7
Choose a base branch
from
Open

Gogs develop into Gitea release/1.7 #3

wants to merge 199 commits into from

Conversation

richmahn
Copy link
Owner

Please check the following:

  1. Make sure you are targeting the master branch, pull requests on release branches are only allowed for bug fixes.
  2. Read contributing guidelines: https://github.com/go-gitea/gitea/blob/master/CONTRIBUTING.md
  3. Describe what your pull request does and which issue you're targeting (if any)

You MUST delete the content above including this line before posting, otherwise your pull request will be invalid.

Richard Mahn and others added 30 commits November 23, 2016 08:37
Added Door43 icons
9789683
Added YAML viewer support
e32ba46
Adds YAML support
bb311f9
Changed CODE tab to Files tab
f56b00f
Added YAML viewer support
af76cbc
Adds YAML support
29fd1d0
Fixed file viewing bug
3e05cf2
Auto-add webhook
501319b
@richmahn
Update .travis.yml
89cd454
Updated YAML modules
91b004b
Added Door43 icons
a342616
Changed interface (go-gitea#3685)
559a6ef
Added YAML viewer support
ed76365
Adds YAML support
3ce4a76
Added YAML viewer support
010653c
Adds YAML support
06184b6
Fixed file viewing bug
267d178
Updated YAML modules
0047e66
Updated travis status
8a826aa
@richmahn
Update README.md
a9d6001
@richmahn
Update README.md
b837328
@richmahn
Update .travis.yml
193c396
Added yaml.v2
4122c77
Added check.v1
c74d6a2
@richmahn
Fixes go-gitea#87 - Make hashtags hyperlinks in HTML view (go-gitea#96)
1fa996b 
* Fixes go-gitea#87 - Make Hashtags Hyperlinks in HTML view

* Added hashtag_test.go for testing
Adds Google Analytics to templates
2787276
@richmahn
Merge pull request go-gitea#97 from richmahn/feature/fixes-80-add-goo…
e518cca 
…gle-analytics-to-templates

Fixes go-gitea#80: add Google Analytics to templates
Create hashtag table in DB
4620f0a
@richmahn
Merge pull request go-gitea#98 from richmahn/feature/330-create-hasht…
d8c2ef7 
…ag-table-in-db

go-gitea#330 - Create hashtag table in DB
@phillip-hopper
Make a page to list all tags
eebb42e
jag3773 and others added 29 commits November 20, 2017 08:03
@jag3773
Merge pull request go-gitea#234 from ethantkoenig/about_page
de699c7 
About page
@jag3773
Merge pull request go-gitea#235 from ethantkoenig/ufw/fix/footer
3e5730f 
Fix unresolved merge conflict in footer.tmpl
@ethantkoenig
Fix duplicate help link
eceb7e7 
Also make help link in user dropdown point to ufw.io/team43
@ethantkoenig
Revert header to DCS logo
c2887f5
@ethantkoenig
Fix footer
4974a5d
@ethantkoenig
Merge branch 'master' into ufw/merge_upstream
454f475
@ethantkoenig
Fix coverage reports
0328967
@ethantkoenig
Run coverage reports in CI
e270e32
@jag3773
Merge pull request go-gitea#242 from ethantkoenig/ufw/footer
d376890 
Fix footer
@jag3773
Merge pull request go-gitea#241 from ethantkoenig/ufw/logo
f57fa46 
Revert header to DCS logo
@jag3773
Merge pull request go-gitea#240 from ethantkoenig/ufw/help_link
60982a3 
Fix duplicate help link
@jag3773
Merge pull request go-gitea#243 from ethantkoenig/ufw/merge_upstream
500e773 
Merge upstream changes
@ethantkoenig
Increase font size in Home/About page
adf3d92
@jag3773
Merge pull request go-gitea#244 from ethantkoenig/ufw/font_size
1c26f34 
Increase font size in Home/About page
@ethantkoenig
Merge branch 'master' into ufw_develop
4ab9ff4
@jag3773
Merge pull request go-gitea#245 from ethantkoenig/ufw_develop
7426e5e 
Merge changes from upstream
@ethantkoenig
Restore accidentally-removed Google Analytics JS (go-gitea#247)
2886822 
* Restore accidentally-removed Google Analytics JS

* Empty commit to rerun CI
@ethantkoenig
Integration test for Google Analytics (go-gitea#248)
211a76d
@ethantkoenig
Disable repo indexer in integration tests (go-gitea#255)
464934a
@ethantkoenig
Fix fork template (go-gitea#252)
cb9abfa
@ethantkoenig
Add request info to error log messages (go-gitea#253)
f95723c
@ethantkoenig
Fix SQL type error for webhooks (go-gitea#256)
e250cc0
@ethantkoenig
Merge upstream (up to upstream release 1.4.0)
a2489be
@ethantkoenig
Fix git integration test
a8b4c68
@ethantkoenig
Empty commit to rerun CI
ae0eb5a
@ethantkoenig
Merge pull request go-gitea#261 from ethantkoenig/ufw/merge_upstream
c3a616f 
Merge changes from upstream
@ethantkoenig
Use unique temp dirs in unit tests
a28530e
@ethantkoenig
Only run coverage report when pushing (go-gitea#266)
e6a16ef
@ethantkoenig
Fix repo header buttons (go-gitea#264)
9caee71
richmahn pushed a commit that referenced this pull request Jul 27, 2020
@zeripath @techknowlogick
@sapk @6543 @guillep2k
Contents API should return 404 on not exist (go-gitea#10323)
2e85ad6 
* Return 404 on not exist

* swagger update and use git.IsErrNotExist

* Handle delete too

* Handle delete too x2

* Fix pr 10323 (#3)

* fix TESTS

* leafe a note for fututre

* placate golangci-lint

Signed-off-by: Andrew Thornton <[email protected]>

* Update integrations/api_repo_file_delete_test.go

Co-Authored-By: 6543 <[email protected]>

Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: Antoine GIRARD <[email protected]>
Co-authored-by: 6543 <[email protected]>
Co-authored-by: guillep2k <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@richmahn @phillip-hopper @ethantkoenig @bspidel @lunny @philfry @cez81 @jag3773