| Age | Commit message (Collapse) | Author |
|---|
|
Return request profiling info when a header is passed
## What does this MR do?
It allows returning profiling info (instead of actual content) when a certain header is passed
## Why was this MR needed?
To facilitate having a performance overview of certain requests.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-com/infrastructure/issues/211
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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~~
- [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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5281
|
|
into 'master'
Fix a bug where forking a project from a repository storage to another would fail
## What does this MR do?
Fix a bug where forking a project from a repository storage to another would fail.
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
If you have a project in storage_a, change the default storage to storage_b, and attempt to fork said project, the import will fail.
## What are the relevant issue numbers?
Closes #20302
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] 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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
- [ ] Merge https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/75, publish the tag, and update `GITLAB_SHELL_VERSION`
See merge request !5509
|
|
Remove inline scripts from import pages.
## What does this MR do?
Removes inline scripts from the Import Status pages for all the importers we have.
## Are there points in the code the reviewer needs to double check?
That this doesn't break anything (it didn't when I tested it!)
## Why was this MR needed?
Inline scripts are bad, this removes a few of them.
## What are the relevant issue numbers?
#18231 and #19866
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5283
|
|
Make branches sortable without push permission
## What does this MR do?
Make branches on the branches page sortable without push permission.
## Why was this MR needed?
Sorting branches (a readonly action) required push permission which does not make sense.
## What are the relevant issue numbers?
fixes #18678
## Screenshots
### Before
### After
See merge request !5462
|
|
fail
|
|
Instead add data attributes to a JS hook element on every import status page.
|
|
|
|
Resolve "Commits graph has overlapping text on mobile"
Apply responsive design for labels on Commits and Continuous Integration graphs.
## What does this MR do?
Make the labels on Commits and Continuous Integration graphs smaller for mobile devices.
## Are there points in the code the reviewer needs to double check?
Graphs should not break at any screen size.
## Why was this MR needed?
Labels overlaps each other on mobile devices.
## What are the relevant issue numbers?
Fixes #18846 (but also fixes a similar bug on Continuous Integration graph).
## Screenshots (if relevant)
Before:
After:
## Does this MR meet the acceptance criteria?
- ~~[ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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~~
- [x] All builds are passing
- [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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
cc: @jschatz1
See merge request !4841
|
|
|
|
A release's tag reference is just the name of the tag, not the entire
tag object.
This also fixes the tags index if a tag's message contains non-UTF8 byte
sequences.
|
|
'master'
Rescue Rugged::OSError (lock exists) when creating references.
## What does this MR do?
Rescue an exception on concurrent scenarios. I was able to create a spec for this, because if you create the lock file before trying to create the reference the reference is created without a problem and the lock file is removed. So IMHO there is a race condition where more than one process is trying to create the same reference at the same time raising the exception, so I just added the patch without specs.
```ruby
it "attempting to call keep_around when exists a lock does not fail" do
ref = repository.send(:keep_around_ref_name, sample_commit.id)
path = File.join(repository.path, ref)
lock_path = "#{path}.lock"
FileUtils.mkdir_p(path)
File.open(lock_path, 'w') { |f| f.write('') }
begin
# No exception is raised because the lock file is removed at some point in the process
repository.keep_around(sample_commit.id)
ensure
File.delete(path)
File.delete(lock_path)
end
end
```
## Why was this MR needed?
## What are the relevant issue numbers?
Closes #20156
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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
- [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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5497
|
|
Add branch or tag icon to ref in builds page
## What does this MR do?
Add branch or tag icon to ref in builds page
## Why was this MR needed?
It's currently missing but should be there
## What are the relevant issue numbers?
Closes #20139
## Screenshots (if relevant)
<img src="/uploads/fb5c9a285a1ce95c0aa8dfa5e32c5d7d/Screen_Shot_2016-07-22_at_9.14.39_AM.png" width="400px">
See merge request !5434
|
|
'master'
Fix expand all diffs button in compare view
## What does this MR do?
Fix the expand all diffs button in compare view.
## Are there points in the code the reviewer needs to double check?
Don't think so.
## Why was this MR needed?
We can't reuse the existing value of the format parameter, because on
the merge request page that's 'json', so the link would go to a JSON
file. We can't set it to HTML, because that adds '.html' to the URL, which
breaks the compare view (and looks bad). Setting it to `nil` uses the
default format, which in all of these cases is HTML anyway.
## What are the relevant issue numbers?
Closes #20241.
See merge request !5500
|
|
Multiple trigger variables show in separate line
## What does this MR do?
Separate lines for multiple trigger variables
## Screenshot
## What are the relevant issue numbers?
Closes #19006
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Add tests for multiple trigger variables view
- [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
cc @ubudzisz @grzesiek @yorickpeterse @tmaczukin [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash)
See merge request !5357
|
|
We can't reuse the existing value of the format parameter, because on
the merge request page that's 'json', so the link would go to a JSON
file. We can't set it to HTML, because that adds '.html' the URL, which
breaks the compare view (and looks bad). Setting it to nil uses the
default format, which in all of these cases is HTML anyway.
|
|
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
'khaiql/gitlab-ce-fix/missleading-uri-for-labels-in-merge-requests-and-issues-view'
|
|
|
|
Fixed dropdown search field height in ie11
## What does this MR do?
Fixes the height of the search input in dropdown menus.
## What are the relevant issue numbers?
Closes #19684
## Screenshots (if relevant)
See merge request !5179
|
|
Reduced diff email CSS
## What does this MR do?
Reduces the amount of inline CSS on the diff emails.
## What are the relevant issue numbers?
#15178
See merge request !5203
|
|
Add green outline to New Branch button
## What does this MR do?
Add green outline to New Branch button on issue page.
## Are there points in the code the reviewer needs to double check?
Nope.
## Why was this MR needed?
The button was not very visible.
## What are the relevant issue numbers?
fixes #18928
## Screenshots
### Before
### After
See merge request !5447
|
|
Use project ID in repository cache to prevent stale data from persisting across projects
See merge request !5460
|
|
across projects
We have a number of bugs caused by cache keys not being flushed
properly during deletion of a project. Add the project ID to ensure
this never happens.
Closes #20027
|
|
Users can filter branches by name on project branches page
This MR aims to solve #18674 by adding the possibility to filter project branches by name
See merge request !5144
|
|
Remove magic comments from Ruby files
## What does this MR do?
Remove magic comments (`# encoding: UTF-8`) from Ruby files.
## Why was this MR needed?
Since Ruby 2, UTF-8 is the default encoding and those comments are no longer necessary.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5163#note_13134307
cc @rymai
See merge request !5456
|
|
Make fork counter always clickable
## What does this MR do?
Make the fork counter on project pages clickable for people who forked the project.
## Why was this MR needed?
The fork counter was not clickable.
## What are the relevant issue numbers?
fixes #20205
See merge request !5463
|
|
Fix Error 500 when creating Wiki pages with hyphens or spaces
- Closes gitlab-com/support-forum#874
- Closes #20209
See merge request !5444
|
|
1. So we can build the markdown preview URL for it.
2. We can't skip the slug in this case, because the slug is used to
construct relative markdown URLs.
3. Add rspec feature tests to cover creating wiki pages with
spaces/hyphens in the name.
4. Add rspec feature tests for markdown preview URL rewriting, which was
only covered by unit tests up to this point.
|
|
|
|
|
|
'17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…"
This reverts merge request !5375
|
|
Closes gitlab-com/support-forum#874
|
|
|
|
|
|
Fix bug where replies to commit notes displayed in the MR discussion tab wouldn'…
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20157
See merge request !5446
|
|
Add gitlab-workhorse version to admin dashboard
## What does this MR do?
Add gitlab-workhorse version to admin dashboard.
## What are the relevant issue numbers?
Closes #15418
## Screenshot
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Add test - show Gitlab Workhorse version on Admin Dashboard
- [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
cc @ubudzisz @yorickpeterse @grzesiek [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash)
See merge request !5321
|
|
wouldn't show up on the commit page
|
|
Improve project rename log messages for better debugging
This should help diagnose issues such as #20178.
See merge request !5450
|
|
Add light border to rounded avatars
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20128
To make it clear that avatar is cropped by border radius
cc @hazelyang
See merge request !5429
|
|
Helping to diagnose #20178
|
|
Test for showing GitLab Workhorse version on Admin Dashboard
Refactoring
|
|
|
|
|
|
Fix missing repo_ref param
Closes #19444
See merge request !5435
|
|
'master'
Load project invited groups and members eagerly in ProjectTeam#fetch_members
## What does this MR do?
Load project invited groups and members eagerly in `ProjectTeam#fetch_members`, reducing number of queries to DB.
## Are there points in the code the reviewer needs to double check?
N/A
## Why was this MR needed?
`ProjectTeam#fetch_members` is part of the code path of `Participable#raw_participants`, so it should improve its performance a bit.
## What are the relevant issue numbers?
#19985
## Screenshots (if relevant)
N/A
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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~~
- [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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5436
|
|
|
|
|
