John Olheiser 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e76a64dda1 
							
						 
					 
					
						
						
							
							Inject SVG sprite via ajax ( #10320 )  
						
						... 
						
						
						
						* AJAX SVG
* Fix PWA
* Remove unused PWA assets
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-Authored-by: silverwind <me@silverwind.io> 
						
						
					 
					
						2020-02-17 23:11:59 +00:00 
						 
				 
			
				
					
						
							
							
								zeripath 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							05c1f2b45c 
							
						 
					 
					
						
						
							
							Create Changelog for v1.11.1 release ( #10286 ) ( #10321 )  
						
						... 
						
						
						
						* Create Changelog
* Update CHANGELOG.md
* Include
Co-authored-by: techknowlogick <matti@mdranta.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> 
						
						
					 
					
						2020-02-17 21:43:20 +00:00 
						 
				 
			
				
					
						
							
							
								zeripath 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e96f3542d0 
							
						 
					 
					
						
						
							
							Set the initial commit status to Success otherwise it will always be Pending ( #10317 )  
						
						... 
						
						
						
						The commit status code has a bug whereby setting the initial status to Pending means you can never have the status of Success - it should be set to Success. 
						
						
					 
					
						2020-02-17 20:22:36 +00:00 
						 
				 
			
				
					
						
							
							
								zeripath 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							314740e215 
							
						 
					 
					
						
						
							
							Truncate long commit message header ( #10301 )  
						
						... 
						
						
						
						* Truncate long commit message header
* Fix overflow in view commit table
* Use @media less
* Further improvements
* Fix the commit message on small screens
* adjust width of minimal table 
						
						
					 
					
						2020-02-17 19:45:55 +02:00 
						 
				 
			
				
					
						
							
							
								mrsdizzie 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b5f28d154d 
							
						 
					 
					
						
						
							
							Don't manually replace whitespace during render ( #10291 )  
						
						... 
						
						
						
						* Don't manually replace whitespace during render
For historical reasons Gitea manually alters the urlPrefix and replaces
a whitespace with a +. This Works for URLs, but we're also passing
urlPrefix to git calls and adding the + is breaking the tree path.
Goldmark will automatically convert a white space to the proper %20, so
we should leave the string as is which lets us pass it to git unmodified
and then let Goldmark fix it.
Also fixed separate bug in URLJoin I noticed while testing where it will
silently discard sections of a path that have # in them (possibly
others). We should just escape it first.
Fixes 10156
* Escape elems as well
* Revert "Escape elems as well"
This reverts commit 8bf49596fee6fac4d9da256cd1e90a0ec0183671.
* restart ci
* remove changes to URLJoin
* restart ci
Co-authored-by: techknowlogick <matti@mdranta.net> 
						
						
					 
					
						2020-02-17 07:46:51 +02:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							7af6f8b465 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2020-02-16 21:43:17 +00:00 
						 
				 
			
				
					
						
							
							
								zeripath 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8bba797252 
							
						 
					 
					
						
						
							
							v1.10.4 Changelog ( #10294 ) ( #10306 )  
						
						... 
						
						
						
						* v1.10.4 Changelog
* Add backport identifier for #10261 
* Update CHANGELOG.md entry for #9884 
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> 
						
						
					 
					
						2020-02-16 16:38:24 -05:00 
						 
				 
			
				
					
						
							
							
								Antoine GIRARD 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5a46ec647b 
							
						 
					 
					
						
						
							
							fix: set explicit POSTGRES_PASSWORD for pgsql on drone CI ( #10302 )  
						
						
						
						
					 
					
						2020-02-16 22:46:29 +02:00 
						 
				 
			
				
					
						
							
							
								Antoine GIRARD 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cdda5c4b90 
							
						 
					 
					
						
						
							
							ui: better mobile review-box sizing ( #10297 )  
						
						
						
						
					 
					
						2020-02-16 22:44:52 +02:00 
						 
				 
			
				
					
						
							
							
								Antoine GIRARD 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9bada628f2 
							
						 
					 
					
						
						
							
							make: add release-sources  ( #10295 )  
						
						... 
						
						
						
						* make: add release-sources
* make: release-sources exclude .git and make_evidence 
						
						
					 
					
						2020-02-16 12:53:02 -05:00 
						 
				 
			
				
					
						
							
							
								Antoine GIRARD 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							df758f3cc9 
							
						 
					 
					
						
						
							
							make/pr: enforce vendor for run ( #10296 )  
						
						
						
						
					 
					
						2020-02-16 16:30:09 +00:00 
						 
				 
			
				
					
						
							
							
								techknowlogick 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c0bc9871be 
							
						 
					 
					
						
						
							
							Blacklist manifest.json & milestones user ( #10292 )  
						
						... 
						
						
						
						Fix  #10290  
					
						2020-02-16 02:56:49 -05:00 
						 
				 
			
				
					
						
							
							
								zeripath 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							791b109d6f 
							
						 
					 
					
						
						
							
							Notification: queue ui.go notification-service ( #10281 )  
						
						... 
						
						
						
						Co-authored-by: Lauris BH <lauris@nix.lv> 
						
						
					 
					
						2020-02-15 19:29:43 -05:00 
						 
				 
			
				
					
						
							
							
								Gary Kim 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5563d56a32 
							
						 
					 
					
						
						
							
							Update static resources documentation ( #10270 )  
						
						... 
						
						
						
						Signed-off-by: Gary Kim <gary@garykim.dev>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: zeripath <art27@cantab.net> 
						
						
					 
					
						2020-02-16 01:00:40 +02:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							78859ba274 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2020-02-15 18:47:31 +00:00 
						 
				 
			
				
					
						
							
							
								zeripath 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							88986746d5 
							
						 
					 
					
						
						
							
							Fix Workerpool deadlock ( #10283 )  
						
						... 
						
						
						
						* Prevent deadlock on boost
* Force a boost in testchannelqueue 
						
						
					 
					
						2020-02-15 18:44:58 +00:00 
						 
				 
			
				
					
						
							
							
								guillep2k 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							15614a8368 
							
						 
					 
					
						
						
							
							Divide GetIssueStats query in smaller chunks ( #10176 )  
						
						... 
						
						
						
						* Divide GetIssueStats query in smaller chunks
* Skip chunking if count is low enough
* Fix lint
* Define maxQueryParameters
* Remove absMaxQueryParameters because of lint
* Restart CI
* Restart CI
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv> 
						
						
					 
					
						2020-02-15 11:51:25 +01:00 
						 
				 
			
				
					
						
							
							
								guillep2k 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7e920703f9 
							
						 
					 
					
						
						
							
							Move fixture generation to contrib and add test  ( #10277 )  
						
						... 
						
						
						
						* Add fixture gen tool and fix "access" test
* Close file before exiting
* Add missing repo_unit for repo id: 5
* Fix count on TestAPIOrgRepos
* Generate access fixture from contrib and add test
* Remove old access fixture generation
* Fix lint
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> 
						
						
					 
					
						2020-02-15 10:59:43 +02:00 
						 
				 
			
				
					
						
							
							
								guillep2k 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							62a1322cf9 
							
						 
					 
					
						
						
							
							Fix "access" fixtures and tests ( #10247 )  
						
						... 
						
						
						
						* Add fixture gen tool and fix "access" test
* Close file before exiting
* Add missing repo_unit for repo id: 5
* Fix count on TestAPIOrgRepos
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> 
						
						
					 
					
						2020-02-15 12:29:06 +08:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							a97fe76950 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2020-02-14 12:44:14 +00:00 
						 
				 
			
				
					
						
							
							
								Lauris BH 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a1d796f521 
							
						 
					 
					
						
						
							
							Index code and stats only for non-empty repositories ( #10251 )  
						
						... 
						
						
						
						Fix test and switch to unique queue
Fix MySQL support when deleting old statistics 
						
						
					 
					
						2020-02-14 13:42:30 +01:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							ff261dafc4 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2020-02-14 03:09:58 +00:00 
						 
				 
			
				
					
						
							
							
								John Olheiser 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							41d61d470e 
							
						 
					 
					
						
						
							
							Update discord link ( #10263 )  
						
						
						
						
					 
					
						2020-02-13 22:07:10 -05:00 
						 
				 
			
				
					
						
							
							
								Lunny Xiao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5dbf36f356 
							
						 
					 
					
						
						
							
							Issue search support elasticsearch ( #9428 )  
						
						... 
						
						
						
						* Issue search support elasticsearch
* Fix lint
* Add indexer name on app.ini
* add a warnning on SearchIssuesByKeyword
* improve code 
						
						
					 
					
						2020-02-13 14:06:17 +08:00 
						 
				 
			
				
					
						
							
							
								Lunny Xiao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							17656021f1 
							
						 
					 
					
						
						
							
							Fix reply on code review ( #10227 )  
						
						... 
						
						
						
						Co-authored-by: zeripath <art27@cantab.net> 
						
						
					 
					
						2020-02-13 13:22:15 +08:00 
						 
				 
			
				
					
						
							
							
								David Svantesson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9ff4e1d2d9 
							
						 
					 
					
						
						
							
							Add API branch protection endpoint ( #9311 )  
						
						... 
						
						
						
						* add API branch protection endpoint
* lint
* Change to use team names instead of ids.
* Status codes.
* fix
* Fix
* Add new branch protection options (BlockOnRejectedReviews, DismissStaleApprovals, RequireSignedCommits)
* Do xorm query directly
* fix xorm GetUserNamesByIDs
* Add some tests
* Improved GetTeamNamesByID
* http status created for CreateBranchProtection
* Correct status code in integration test
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net> 
						
						
					 
					
						2020-02-12 23:19:35 +00:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							908f8952be 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2020-02-12 19:33:28 +00:00 
						 
				 
			
				
					
						
							
							
								techknowlogick 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7791d904b4 
							
						 
					 
					
						
						
							
							Add note about which version embedded tool is implemented ( #10255 )  
						
						
						
						
					 
					
						2020-02-12 14:30:48 -05:00 
						 
				 
			
				
					
						
							
							
								Lunny Xiao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3d69bbd58f 
							
						 
					 
					
						
						
							
							Fix queue pop error and stat empty repository error ( #10248 )  
						
						... 
						
						
						
						* Fix queue pop error and stat empty repository error
* Fix error 
						
						
					 
					
						2020-02-12 18:12:27 +08:00 
						 
				 
			
				
					
						
							
							
								Lunny Xiao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							83a8944fcf 
							
						 
					 
					
						
						
							
							Add feishu webhook support ( #10229 )  
						
						... 
						
						
						
						Add feishu webhook support 
						
						
					 
					
						2020-02-12 08:48:28 +00:00 
						 
				 
			
				
					
						
							
							
								silverwind 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ea7ad382e7 
							
						 
					 
					
						
						
							
							fix margin on attached segments with headers ( #10235 )  
						
						... 
						
						
						
						Fixes: https://github.com/go-gitea/gitea/issues/10210 
Co-authored-by: techknowlogick <matti@mdranta.net> 
						
						
					 
					
						2020-02-11 22:38:32 -05:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							685a0037d2 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2020-02-12 01:54:51 +00:00 
						 
				 
			
				
					
						
							
							
								John Olheiser 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d67e9b9629 
							
						 
					 
					
						
						
							
							SVG Octicon fixes ( #10237 )  
						
						... 
						
						
						
						* SVG fixes
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Colorize span->svg only
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* @silverwind suggestions
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Alphabetical
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Convert suburl and staticPrefix to window.config
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* De-structure
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> 
						
						
					 
					
						2020-02-11 20:53:18 -05:00 
						 
				 
			
				
					
						
							
							
								jaqra 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2399bad1f1 
							
						 
					 
					
						
						
							
							fix label menu text on miletone issues ( #10242 )  
						
						... 
						
						
						
						Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> 
						
						
					 
					
						2020-02-12 01:07:07 +01:00 
						 
				 
			
				
					
						
							
							
								zeripath 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1125d1453b 
							
						 
					 
					
						
						
							
							Stop hanging issue indexer initialisation from preventing shutdown ( #10243 )  
						
						... 
						
						
						
						Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> 
						
						
					 
					
						2020-02-12 00:21:20 +01:00 
						 
				 
			
				
					
						
							
							
								jaqra 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6c823c7560 
							
						 
					 
					
						
						
							
							fix filter label emoji width ( #10241 )  
						
						
						
						
					 
					
						2020-02-11 22:25:41 +01:00 
						 
				 
			
				
					
						
							
							
								James Lakin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							54af3c90c7 
							
						 
					 
					
						
						
							
							Fix issue sidebar menus having an infinite height ( #10239 )  
						
						... 
						
						
						
						* Revert "Limit label list height on edit issue page"
* Fix issue sidebar menus having an infinite height 
						
						
					 
					
						2020-02-11 22:40:47 +02:00 
						 
				 
			
				
					
						
							
							
								silverwind 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d9c79986ea 
							
						 
					 
					
						
						
							
							add TAGS variable prereq on make targets that use it ( #10219 )  
						
						... 
						
						
						
						Write out TAGS to .make_evidence/tags and compare it to the previous
invocation. If they differ, insert the evidence file into the prereqs
of targets that use TAGS. I made it .PHONY so it always builds.
I did not include the prereq on release tasks, asssuming the will always
do a clean build.
Fixes: https://github.com/go-gitea/gitea/issues/10196 
Co-authored-by: techknowlogick <matti@mdranta.net>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> 
						
						
					 
					
						2020-02-11 20:42:03 +01:00 
						 
				 
			
				
					
						
							
							
								6543 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bfd62b6f01 
							
						 
					 
					
						
						
							
							update vendor keybase/go-crypto ( #10234 )  
						
						
						
						
					 
					
						2020-02-11 20:58:23 +02:00 
						 
				 
			
				
					
						
							
							
								John Olheiser 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							86fdba177a 
							
						 
					 
					
						
						
							
							Add Octicon SVG spritemap ( #10107 )  
						
						... 
						
						
						
						* Add octicon SVG sprite
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Static prefix
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* SVG for all repo icons
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* make vendor
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Swap out octicons
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Move octicons to top of less imports
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Fix JS
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Definitely not a search/replace
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Missed regex
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Move to more generic calls and webpack
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* make svg -> make webpack
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Remove svg-sprite
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Update tests
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Missed a test
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Remove svg from makefile
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Suggestions
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Attempt to fix test
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Update tests
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Revert timetracking test
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Swap .octicon for .svg in less
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Add aria-hidden
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Replace mega-octicon
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Fix webpack globbing on Windows
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Revert
Co-Authored-By: silverwind <me@silverwind.io>
* Fix octions from upstream
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Fix Vue and missed JS function
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Add JS helper and PWA
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Preload SVG
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <matti@mdranta.net> 
						
						
					 
					
						2020-02-11 12:02:41 -05:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							e704f7fae7 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2020-02-11 15:44:26 +00:00 
						 
				 
			
				
					
						
							
							
								jaqra 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							602b29e965 
							
						 
					 
					
						
						
							
							Limit label list height on edit issue page ( #10216 )  
						
						
						
						
					 
					
						2020-02-11 16:41:48 +01:00 
						 
				 
			
				
					
						
							
							
								Lauris BH 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ad2642a8aa 
							
						 
					 
					
						
						
							
							Language statistics bar for repositories ( #8037 )  
						
						... 
						
						
						
						* Implementation for calculating language statistics
Impement saving code language statistics to database
Implement rendering langauge stats
Add primary laguage to show in repository list
Implement repository stats indexer queue
Add indexer test
Refactor to use queue module
* Do not timeout for queues 
						
						
					 
					
						2020-02-11 11:34:17 +02:00 
						 
				 
			
				
					
						
							
							
								zeripath 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							37892be635 
							
						 
					 
					
						
						
							
							Restore graceful restart on SIGHUP ( #10224 )  
						
						... 
						
						
						
						Co-authored-by: Lauris BH <lauris@nix.lv> 
						
						
					 
					
						2020-02-11 13:29:45 +08:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							b3255921af 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2020-02-10 23:07:55 +00:00 
						 
				 
			
				
					
						
							
							
								Lauris BH 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							852aeeffc0 
							
						 
					 
					
						
						
							
							Fix commit between two commits calculation if there is only last commit ( #10225 )  
						
						
						
						
					 
					
						2020-02-11 01:04:43 +02:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							26eaebf4de 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2020-02-10 19:26:08 +00:00 
						 
				 
			
				
					
						
							
							
								guillep2k 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							069a96ebe2 
							
						 
					 
					
						
						
							
							Improve 404 error message ( #10214 )  
						
						
						
						
					 
					
						2020-02-10 21:23:35 +02:00 
						 
				 
			
				
					
						
							
							
								John Olheiser 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b5418a6443 
							
						 
					 
					
						
						
							
							Changelog 1.11.0 ( #10204 ) ( #10211 )  
						
						... 
						
						
						
						Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> 
						
						
					 
					
						2020-02-10 11:16:31 -05:00 
						 
				 
			
				
					
						
							
							
								zeripath 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9789e0ad53 
							
						 
					 
					
						
						
							
							Only show conflicted files if not merged ( #10197 )  
						
						... 
						
						
						
						* Only show conflicted files if not merged
* try again
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: techknowlogick <matti@mdranta.net> 
						
						
					 
					
						2020-02-09 21:53:41 -05:00