| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into 'master'
Add a page title to every page.
The `page_title` helper pushes the provided string at the end of the title, but because of the order that layouts are rendered in by ActionView, the result is always this:
```
<title from view> |
<title from as specified in the controller or by its layout> |
<title from layouts/_head>
```
For example: `Merge Requests | GitLab.org / Gitlab Community Edition | GitLab`.
All a developer needs to know is to put a `page_title` call describing the page in question at the start of every template.
To get everything where I wanted it to go without too much duplication, I had to make some changes around layouts, sidebars and controllers.
See merge request !593
|
| | | | | |
| | | | |
| | | | |
| | | | | |
controllers to layouts.
|
| | |/ / / |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
This just extends the HTML::Pipeline::SanitizationFilter with our custom
whitelist.
|
| | | | | |
|
| |/ / /
| | |
| | |
| | | |
Removes header and table of contents processing from Redcarpet renderer.
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix "Revspec not found" errors when viewing diffs in a forked project with submodules
## What does this MR do?
This MR fixes an error that occurs when viewing diffs in a forked project with submodules.
### Are there points in the code the reviewer needs to double check?
Testing this code was tricky. The only way this problem shows up is if the origin project does NOT have the submodule update commit. The introduction of gitlab-test-fork serves that purpose: it contains a submodule update not present in gitlab-test.
### Why was this MR needed?
A user would receive a 500 error when trying to view a merge request with a submodule update. #1413 has details on how to reproduce this issue.
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
#1413
See merge request !512
|
| | | |
| | |
| | |
| | |
| | |
| | | |
submodules
Closes #1413
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | | |
Add footnotes support to Markdown
This merge request fix this issue : https://gitlab.com/gitlab-org/gitlab-ce/issues/555
See merge request !572
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Guillaume Delbergue <guillaume.delbergue@greensocs.com>
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix broken file browsing with relative submodule in personal projects
Git submodules with relative links work fine for projects in groups but not in personal projects. This patch fixes this issue.
To reproduce the problem, go here:
https://gitlab.com/andrewwu.tw/submodule-test/tree/master
Closes https://github.com/gitlabhq/gitlabhq/issues/7554
See merge request !565
|
| | | | |
| | | |
| | | |
| | | | |
Closes https://github.com/gitlabhq/gitlabhq/issues/7554
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Add new global application settings for default project and snippet
visibility levels.
|
| | | | | |
|
| | |/ /
|/| | |
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/snippets_controller.rb
|
| | | |
| | |
| | |
| | |
| | | |
Fixes #2257
Fixes #2260
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
Commit ranges, commits, external issues, issues, labels, merge requests,
snippets, users.
|
| |/ /
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Having a merge request with a comments on a line which is then changed
in a later commit prevented new comments from properly showing up in the
merge request show page.
* `Note#set_diff` do not use stored the diff when creating a new note
in merge requests (we can not be sure the diff did not changed since
the last comment on that line)
* Do not rely just on `outdated?` of the first note when displaying
comments of a MR in the discussion tab, but partition the
active/outdated notes and display them all
* In the inline changes tab just select the active notes, so an
outdated note does not prevent an active one from being rendered
* Just show active comments in the side-by-side changes tab
|
| | | |
|
| | | |
|
| | | |
|
| |\ \ |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Revert "Merge branch 'fix_email_images' into 'master'"
This reverts commit d66148ef393f1748c669c934eec4e928d92ef36a, reversing
changes made to cdb64a81a8ca96961033b8ab06d5191ef5449634.
This change needed to be reverted,
because not enough email clients support inline images.
/cc @DouweM As discussed before. I'll try to create a MR to allow access to all images this week. I'm a bit busy at the moment so no guarantees. ;)
See merge request !513
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit d66148ef393f1748c669c934eec4e928d92ef36a, reversing
changes made to cdb64a81a8ca96961033b8ab06d5191ef5449634.
This change needed to be reverted,
because not enough email clients support inline images.
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Speed up the overridden `link_to` helper
Only bothers to check the provided link's external status if it's a String that doesn't begin with a path or anchor character.
See merge request !1767
|
| | | | |
| | | |
| | | |
| | | | |
[ci skip]
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Only bothers to check the provided link's external status if it's a
String that doesn't begin with a path or anchor character.
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Only allow users to reference groups, projects, issues, MRs, commits they have access to.
Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183.
See merge request !1742
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Allow admin to create public deploy keys that are accessible to any project.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774.
Project settings:
The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown.
The list of projects below the public key has been changed to only show projects the user has access to.
"Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys.
Admin index:
Admin detail page:
Projects using the deploy key are listed on the left and can be disabled easily.
See merge request !469
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix persistent XSS vulnerability around profile website URLs.
Fixes gitlab/gitlab-ee#268
See merge request !1761
|
| | | | | | |
|
| |\ \ \ \ \
| |/ / / /
|/| | | | |
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fix broken file browsing with a submodule that has a relative link
## What does this MR do?
This MR fixes an error that occurs when browsing a submodule with a relative link.
### Are there points in the code the reviewer needs to double check?
I re-wrote the function because I was confused by how the first one was supposed to work. Please review if it's clearer.
### Why was this MR needed?
A 500 Error would occur when using the file browser on a repo with a submodule. Here's how to reproduce the bug:
1. Start a new project in GitLab.
2. Clone git://git.gniibe.org/gnuk/gnuk.git/ locally.
3. Push repo to new project.
4. Click on "Files" in the project.
The .gitmodules file:
```
[submodule "chopstx"]
path = chopstx
url = ../../chopstx/chopstx.git
```
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
1. #775
2. #1385
3. https://github.com/gitlabhq/gitlabhq/issues/8153
4. https://github.com/gitlabhq/gitlabhq/issues/8881
5. https://github.com/gitlabhq/gitlabhq/issues/7554
See merge request !508
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Closes #775
|
| | |/ / / /
| | | | |
| | | | |
| | | | | |
Closes #1321
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This option defaults to true in RedCarpet 3.2.0, but we handle
sanitization later in the process with html-pipeline.
Closes #2211
|
| | | | |
| | | |
| | | |
| | | | |
Closes #1363
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix final line in EmailsOnPush email diff being rendered as error.
Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194.
Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18.
See merge request !480
|
| | | | |
| | | |
| | | |
| | | | |
notification email.
|
| | |/ /
|/| |
| | |
| | | |
See https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
lib/gitlab/markdown.rb
|
