| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
Show directory hierarchy when listing wiki pages
Closes #23535
See merge request !8133
|
| |\ |
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
pass in current_user in MergeRequest and MergeRequestsHelper
See merge request !8624
|
| | | |
| | | |
| | | |
| | | | |
MergeRequestsHelper
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Add 'View on [env]' link to blobs and individual files in diffs
See merge request !8867
|
| | | | | |
|
| | | | | |
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix MR widget url
Closes #27632
See merge request !8989
|
| | | | | |
|
|/ / / /
| | | |
| | | |
| | | | |
https://gitlab.com/gitlab-org/gitlab-ce/issues/24007
|
| | | |
| | | |
| | | |
| | | | |
Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/642 back into CE
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |_|/
|/| | |
|
| | |
| | |
| | |
| | | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|/ / |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
'master'
Disable award emoji button but display tooltip
Closes #26168
See merge request !8382
|
| |/ |
|
|/
|
|
| |
Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This adds counters for build artifacts and LFS objects, and moves
the preexisting repository_size and commit_count from the projects
table into a new project_statistics table.
The counters are displayed in the administration area for projects
and groups, and also available through the API for admins (on */all)
and normal users (on */owned)
The statistics are updated through ProjectCacheWorker, which can now
do more granular updates with the new :statistics argument.
|
|
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
| |
* Also is not a good idea to use File.open without closing the file
handler. We should use it with a block or close it explicitly.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Don't accidentally mark unsafe diff lines as HTML safe
Fixes potential XSS issue when a legacy diff note is created on a merge
request whose diff contained HTML
See https://gitlab.com/gitlab-org/gitlab-ce/issues/25249
See merge request !2040
|
| |
|
|
|
|
| |
https://gitlab.com/gitlab-org/gitlab-ce/issues/23546
|
|\
| |
| |
| |
| |
| |
| | |
Add a starting date to milestones
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23704
See merge request !7484
|
| | |
|
|/
|
|
| |
Closes #23938
|
|
|
|
|
|
|
|
| |
Added tests
Added changelog entry
Resolved all issues in code
|
|
|
|
|
|
|
|
| |
This would fix long standing failures running tests on
my development machine, which set `Gitlab.config.gitlab.host`
to another host because it's not my local computer. Now I
finally cannot withstand it and decided to fix them once and
for all.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
500 error on project show when user is not logged in and project is still empty
## What does this MR do?
Aims to fix the 500 error when the project is empty and the user is not logged in and tries to access project#show
## Screenshots (if relevant)
When the project is empty and the user is not logged in we default to the empty project partial instead of readme.
![Screen_Shot_2016-11-11_at_22.54.21](/uploads/3d87e65195376c85d3e515e6d5a9a850/Screen_Shot_2016-11-11_at_22.54.21.png)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #23990
See merge request !7376
|
| |
| |
| |
| | |
repository we now display the activity feed instead of the readme
|
| | |
|
| | |
|
| |
| |
| |
| | |
proper stylesheets
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Search for a filename in a project
Closes #23117
See merge request !7426
|
| |/ |
|
|/
|
|
| |
required
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Remove an extra leading space from diff paste data
## What does this MR do?
Remove an extra leading space from diff paste data.
## Are there points in the code the reviewer needs to double check?
I have checked the following three patterns.
* inline diff
* parallel diff
* blob preview
## Why was this MR needed?
Diff paste data contain an extra leading space.
So it need to remove an extra leading space manually from pasted diff data.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
#14176
Closes #23899
See merge request !7133
|
| | |
|
| | |
|
|/
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
|
|
|
|
|
|
|
| |
Return a non-html-safe, unescaped String instead of ActiveSupport::SafeBuffer
to preserve safety when the output is misused. Currently there's oly one user,
which does the right thing.
Closes #23311
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Optimize the `award_user_list` helper spec
According to
https://gitlab.com/gitlab-org/gitlab-ce/issues/23034#note_16586657, each
test for this helper generated 1,833 queries.
Now we only generate stubbed records, and only as many as we need for
each test.
This also corrects a slight logic bug in the helper itself. When the
number of awards was greater than the limit (9 by default), _and_ the
current user was one of them, we actually included 10 names, including
"You", plus the remaining count. Now we return the correct number
regardless.
See merge request !6722
|