| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Removes redundant enableButton/disableButton extensions, and adds specs
for the jQuery extensions.
|
| |
|
|
|
| |
When this option is `:description`, we use a more restrictive whitelist.
This is used for Project and Group description fields.
|
| | |
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Add ability to leave project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !744
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Support editing target branch of merge request
### What does this MR do?
This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens.
### Why was this MR needed?
Because lots of people requested this feature. :)
### Screenshots
**Edit MR page**
**New MR page**
**System note**
### What are the relevant issue numbers?
* Closes https://github.com/gitlabhq/gitlabhq/issues/7105
* See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130!
See merge request !738
|
| | |
| |
| |
| |
| | |
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
|
| | | |
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |
| |
| |
| |
| |
| | |
Now uses the path instead of the hash.
See discussion in #728.
|
| |/
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix git blame syntax highlighting when different commits break up lines
### What does this MR do?
This MR fixes a bug where syntax highlighting would not work properly in certain lines when doing a `git blame` view of a file. Also, this MR reuses the Rugments lexer and formatter for each `git blame` commit block, which should make things faster and reduce overhead.
### Why was this MR needed?
When doing a `git blame`, GitLab feeds the Rugments lexer/formatter blocks of code based on the latest commit for each line. However, this can cause lexer to fail because the state is cleared between each block of code, which causes `highlight` to fallback to the plaintext lexer. For example, notice this unhighlighted line in [this file](https://gitlab.common-lisp.net/cmucl/cmucl/blame/master/src/assembly/assemfile.lisp):
The fixed version looks like this:
This MR requires a patch to rugments to allow the `continue` option to be passed to the lexer.
* https://github.com/rumpelsepp/rugments/pull/24
* https://github.com/rumpelsepp/rugments/pull/23
* Also submitted to rouge: https://github.com/jneen/rouge/pull/267
### What are the relevant issue numbers?
Closes #1521
See merge request !697
|
| | |
| |
| |
| | |
Closes #1521
|
| |\ \
| | |
| | | |
Some language improvements
|
| | |/ |
|
| |/
|
|
| |
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
|
| | |
|
| |
|
|
| |
filter active.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add Accepted and Rejected tabs to MR lists.
Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201.
See merge request !702
|
| | | |
|
| | | |
|
| |\ \
| | |
| | | |
Validate wiki page creation
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
**What does this do?**
It adds validation to the creation of a wiki page, that way the user gets real
feedback instead of just a 404 page if the name of the wiki page was invalid
**Why is this needed?**
There are a lot of characters that are not allowed in the creation of a wiki
page, there is even a small text that is saying: Please don't use spaces.
Although we have that text there, we don't actually validate on this. This
commit adds validation on the title and gives the user actual feedback.
**What issues does this fix?**
Fixes http://github.com/gitlabhq/gitlabhq/issues/5357
Fixes https://github.com/gitlabhq/gitlabhq/issues/8565
Fixes https://github.com/gitlabhq/gitlabhq/issues/3913
Fixes https://github.com/gitlabhq/gitlabhq/issues/8166
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | | |
Add link_to_label helper
The primary purpose of this change was to make the actual labels on `Labels#index` clickable.
See merge request !690
|
| | | |
| | |
| | |
| | |
| | | |
Now the user can click the labels themselves or the "X open issues"
text.
|
| | | | |
|
| | | |
| | |
| | |
| | | |
`merge_requests_enabled`
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings
Closes #1676
See merge request !691
|
| | | |
| | |
| | |
| | |
| | |
| | | |
disabled in project settings
Closes #1676
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add support for Webhook note events
This MR adds support for note events (comments) for WebHooks.
Perhaps the only potential source of confusion is that the settings indicates "Note Events" instead of "Comments". What do you think?
Screenshot after:
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
See merge request !673
|
| | |/
| |
| |
| | |
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
|
| |/
|
|
| |
Closes #1535
|
| | |
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add explanation about WIP status to MR form.
See merge request !666
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \ |
|
| | |/ / |
|
| |/ / |
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Spin icon next to "Checking for CI status..."
Stationary spinners make me sad.
See merge request !655
|
| | | |
|
| | | |
|
| | | |
|
