34c2e52bd5
repo/pull: allow rebase before merging ( #4805 )
7 years ago
5cd1fdeb9e
pull: add an option to use rebase for merging pull requests
...
For DVCS, either merge or rebase works for getting new code in a pull
request in the main branch.
The rebase workflow produces a linear history which is cleaner, and
more bisect-able.
This commit adds a repo-level option to enable the rebase workflow. Once
enabled, "Merge Pull Request" will be replaced by
"Rebase and Merge Pull Request" which does exactly what the user wants.
It's unlikely a project wants a mixed-use of both rebase and merge
workflows, therefore the feature is not implemented as a drop-down
button like what GitHub does
(https://github.com/blog/2243-rebase-and-merge-pull-requests ).
7 years ago
b727e0be71
SECURITY: fix branch name persistent XSS
...
Reported by Carl Hattenfels.
7 years ago
ac43eab51f
Refactoring: rename Signed -> Logged
8 years ago
90b9f7e08c
pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL}
8 years ago
2c404daca6
pkg/context: rename {CsrfToken, CsrfTokenHtml} -> {CSRFToken, CSRFTokenHTML}
8 years ago
260ebcc1ca
repo/milestone: simplify code
8 years ago
79ba0314e9
milestone: only show issue-related count under issue list ( #4316 )
8 years ago
71753cdd46
templates/label: another minor style improve
8 years ago
d3363430dc
templates/label: minor style improve
...
Add an empty space to make <span> have width.
8 years ago
68b231bd89
template: use DisplayName of users when possible ( #4187 )
8 years ago
28983c94ff
comment: only show title of commit message from a commit ref ( #3206 )
8 years ago
5155f026b4
Security: fix XSS attack on milestone
...
Reported by Miguel Ángel Jimeno.
8 years ago
73fedc7275
provide button to delete merged pull request
8 years ago
28cf0e6aaa
#3459 code quality improvement
8 years ago
92fb30c526
Load a set of predefined labels ( #3459 )
...
* Can use a predefined set of labels
* Change UI
* Fix HTML file indentation
* Avoid reading file from other directory (security issue)
* Apply a better fix
* Remove not used variable
* Merge upstream/develop
* Do modifications
* Raname
* remove binding + rename variable
8 years ago
6f9a95f830
#2246 add HTMLURL to webhook type
...
- Fill Milestone and Assignee field when available in webhook payload
8 years ago
61e27dedf7
#3466 fix response of pull request form validation error
8 years ago
d0a0239bac
Squashed commit of the following:
...
commit 0afcb843d77ecd73ff55c29b9ab53123af384c53cfb8a975917fc8a89991ce427fc8a89cb4fd3d86cc03d040fd3d86ca6bc03d0401c198e1206ccfc2895dc7426aa7e46b21889e9faad7ea88889e9faf1b47603edf22bb57912cf85e9ebb57912558d10d128c5134a3498202fa1b7521c7dcddfa1b752be2
8 years ago
3f7f4852ef
#2246 fully support of webhooks for pull request
8 years ago
25b23c4bc9
Do not show non-image attachment in a <img> tag. Fixes #3215 ( #3311 )
8 years ago
d625e41c6c
#3408 minor code fix
8 years ago
eb1bfe0e59
Do not show the "Sign up for free" button in issue tracker ( #3408 )
...
* Do not show the "Sign up for free" button in issue tracker
The "Sign in to comment" link is good enough and will correctly
show or not show the "Sign Up" button link for those not having
an account already.
Fixes #3407 (link to nowhere when registration is disabled)
* Move html from translation to template
* Remove extra space in `{{ .SignInLink }}`.
8 years ago
90af997fec
#3399 500 for upstream pulls page if user has forked repository
8 years ago
50422f1fc2
#3348 always use relative avatar link in the template
8 years ago
55b4e77a5e
Fix of template error in "/:owner/:repo/pulls" ( #3343 )
...
If anonymous (not signed in user) requests page
"/:owner/:repo/pulls" he gets an error:
template: repo/issue/list:11:105: executing "repo/issue/list" at <.PullRequestCtx.Base...>: nil pointer evaluating *models.Repository.Link
This commit fixes that.
Signed-off-by: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
8 years ago
899e799459
#1601 support delete issue comment
8 years ago
1f2e173a74
Refactor User.Id to User.ID
8 years ago
26d52ceb48
#3186 fix wrong link for new pull request button of non-fork repository
8 years ago
b0eb47cb1c
Fix misselection of issues view type
8 years ago
fdcca9292e
#2458 fix emoji been rendered inside raw content area
8 years ago
a27c6f4b75
#2916 fix sort' field missing on issue pagination link
9 years ago
9a5a27ea8d
Improve repository lable style
...
- add border-radius to filter list items
- use color as background of label for issue/pull view page
9 years ago
c9321550e0
Add prorper escaping of url in issue form
9 years ago
0e9bc2d410
Fix pull request availability check
9 years ago
a5b0400be7
#1146 finish new access rights for collaborators
9 years ago
2d2d85bba4
#1597 support pull requests in same repository
9 years ago
13e71acadf
Render emojis in more places.
9 years ago
c0eaae200e
Add ForegroundColor for labels
9 years ago
658bfc2704
Implement issue and pull request templates.
...
Similar to GitHub:
https://github.com/blog/2111-issue-and-pull-request-templates
Priority:
- root
- .gogs
- .github
9 years ago
af8e323248
Fix tab index on new issue/comment form
9 years ago
1c74612b3c
Minor fix for #2444
9 years ago
b921161666
Name popup
9 years ago
2cc1ee3fc0
Implemented participant-listing for issue-pages
9 years ago
eb918c2368
fix only admin can view milestone desc
9 years ago
da2585c11e
Indent all templates with tabs
...
This commit improves templates readability, since all of them use consistent
indent with all template command blocks indented too.
1. Indents both HTML containers such as <div>, <p> and Go HTML template blocks
such as {{if}} {{with}}
2. Cleans all trailing white-space
3. Adds trailing last line-break to each file
9 years ago
ec2423ad7c
more UI minor fixes
9 years ago
2580e7b57e
UI: Always show menu on repo pages
...
Merges repo/sidebar.tmpl with repo/header.tmpl and makes every repo page use
middleware.RepoRef() necessary to display information on this menu.
9 years ago
3eae4ecde7
UI: Make repository menu divide header and content
...
This is more inline with way GitHub looks like and feels much more natural and
in style with rest of the interface.
9 years ago
5572884c6b
fix #2057
9 years ago
Unknwon
mharinder
Tanapol Nearunchorn
Thibault Meyer
Richard Mahn
Andrey Nering
Sandro Santilli
Okunev Yu Dmitry
Odin Ugedal
Lukas Dietrich
chriswatt
Kim "BKC" Carlbäcker
Adam Strzelecki