| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| | |
Don't notify users mentioned in code blocks or blockquotes.
cc @rspeicher
See merge request !753
|
| | | |
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix link_to_gfm with only a reference having the incorrect link
Before:
```ruby
link_to_gfm("#4", "/foo") # => "<a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
```
After:
```ruby
link_to_gfm("#4", "/foo") # => "<a href="/foo">#4</a>"
link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
```
Closes #192
Closes #1721
Closes [GitHub #7115](https://github.com/gitlabhq/gitlabhq/issues/7115)
See merge request !739
|
| | |
| |
| |
| | |
Closes #1721
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| |/
|
|
| |
as an OAuth provider
|
| |
|
|
| |
Closes #1521
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | | |
|
| | |/
|/|
| |
| | |
`merge_requests_enabled`
|
| |/
|
|
| |
Closes #1535
|
| |\ |
|
| | |
| |
| |
| | |
if something goes wrong, fall back to the plaintext lexer
|
| |/ |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
| |
Tell new users when their password reset token expires and provide a
link to get a new one.
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix reference links in dashboard activity and ATOM feeds.
References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.
This MR passes the project in question to the reference parsers in an option.
cc @rspeicher
See merge request !653
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |/ |
|
| |/ |
|
| |\ |
|
| | |\
| | |
| | | |
Extract handling of relative file links to its own HTML filter
|
| | | | |
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | | |
Version check
See merge request !1509
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/admin/application_settings_controller.rb
app/views/admin/application_settings/_form.html.haml
db/schema.rb
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix commit time being displayed in the wrong timezone in some cases
This MR makes sure that the displayed commit date is shown in the timezone that's configured in the gitlab.yml.
Before it was possible that the `committed_date` of a commit would display different values on the dashboard and the commit page.
fixes gitlab-org/gitlab-ce#1278
/cc @DouweM
See merge request !624
|
| | | | | |
|
| | | | | |
|
| | |/ /
|/| | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use task_list gem for task lists
Task Lists can now be used in comments, and they'll render in previews. :clap:
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271
See merge request !599
|
| | |/ / |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix tooltips for event filter links
See merge request !618
|
| | |/ / |
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Improve handling of large diffs
Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.
https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab.
This patch re-introduces a safe limit on number of lines.
See merge request !539
|
