Age | Commit message (Collapse) | Author |
|
'master'
Truncate long labels with ellipsis in labels page
## What does this MR do?
Fixes #22953, where long labels overlaps into the description field in the labels page. Truncates long labels with ellipsis. Labels that fit are unaffected.
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Fixes #22953.
## Screenshots (if relevant)
Existing behavior:
![image](/uploads/4d85730fe9d039d91036d09bf892d9f2/image.png)
With the change:
![desktop](/uploads/6866389cc3a1e2af5c2def59536a2a7c/desktop.png)
![mobile](/uploads/3d1fbb4a3470abefdd3670f7a794d2a8/mobile.png)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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?
Closes #22953
See merge request !6725
|
|
ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job…
See merge request !6732
|
|
Resolve "Retouch environments list and deployments list"
## What does this MR do?
#### Environments List
- Fixes deployment ID
- Removes bold styling from deployment ID
- Changes Las Deployment Column to have '#ID by user'
- Adds build column with link to the build
- Adds external url to where the environment is hosted
#### Environment Details
- Add link to the build column and changes content to show "build (#id) by user"
- Adds external link to the review app
Adds tests
## Screenshots (if relevant)
#### Environments List
![env_list](/uploads/6cfd737bb0d2f2853a610479877de5a3/env_list.png)
#### Environments Details
![env_details](/uploads/70ec59d7d7de5c1ef57132c2ec9c1b8f/env_details.png)
## 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
- [x] 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)
- [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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #22774
See merge request !6691
|
|
Make Member#add_user set access_level for requesters
## What does this MR do?
This is a backport of https://gitlab.com/gitlab-org/gitlab-ee/commit/c902d8d48409a4d46f7669fc5fc85b9ba86e71d6 from gitlab-org/gitlab-ee!744.
## Why was this MR needed?
This change is only used in EE right now, but there's no reason why it wouldn't be part of CE.
See merge request !6649
|
|
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
|
|
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.
|
|
job per build to cleanup
We use Sidekiq::Client.push_bulk to avoid Redis round trips
|
|
Update user whitelist reject message
## What does this MR do?
Makes email whitelist rejection message more generic. Stops printing all `allowed_domains`
## Why was this MR needed?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23090
See merge request !6731
|
|
Fix Event#reset_project_activity updates
See merge request !6729
|
|
Cache rendered Markdown fields in the database
## What does this MR do?
Introduces cache fields for Markdown-containing fields in the database, and populates them.
## Why was this MR needed?
Rendering Markdown into HTML is performance-intensive. A Redis cache already exists, but this approach is expected to be more performant and reduce unnecessary cache invalidations.
## What are the relevant issue numbers?
Closes #18337
See merge request !6095
|
|
!6678 removed the lease from Event#reset_project_activity, but it wasn't
actually updating the project's last_activity_at timestamp properly.
The WHERE clause would always return no matching projects. The spec
passed occasionally because the created_at timestamp was automatically
set to last_activity_at.
|
|
+ Don't expose all whitelisted domains
|
|
Add tooltip to project fork count
## What does this MR do?
Adds a tooltip reading `Forks` when a user hovers over the count of project forks.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Requested in #23066
## Screenshots (if relevant)
![image](/uploads/023af8dc4df68549705f6a328cf8031c/image.png)
## 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
- [ ] 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)
- [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)
## What are the relevant issue numbers?
#23066
See merge request !6718
|
|
This commit alters views for the following models to use the markdown cache if
present:
* AbuseReport
* Appearance
* ApplicationSetting
* BroadcastMessage
* Group
* Issue
* Label
* MergeRequest
* Milestone
* Project
At the same time, calls to `escape_once` have been moved into the `single_line`
Banzai pipeline, so they can't be missed out by accident and the work is done
at save, rather than render, time.
|
|
Truncato is introduced as a dependency to intelligently shorten the rendered
HTML to 200 characters; the previous approach could have resulted in invalid
HTML being rendered.
|
|
|
|
This commit adds a number of _html columns and, with the exception of Note,
starts updating them whenever the content of their partner fields changes.
Note has a collision with the note_html attr_accessor; that will be fixed later
A background worker for clearing these cache columns is also introduced - use
`rake cache:clear` to set it off. You can clear the database or Redis caches
separately by running `rake cache:clear:db` or `rake cache:clear:redis`,
respectively.
|
|
Change issue board defaults
#### What does this MR do?
Changes the issue board default list from `Development`, `Testing`, `Production`, `Ready` to `To Do` and `Doing`
#### Screenshots (if relevant)
![Screen_Shot_2016-10-06_at_8.46.48_AM](/uploads/6e73e03f5749f18b95bd7e23c676603d/Screen_Shot_2016-10-06_at_8.46.48_AM.png)
![Screen_Shot_2016-10-06_at_9.07.06_AM](/uploads/cadd3af74e3adb73fe854478ce95120e/Screen_Shot_2016-10-06_at_9.07.06_AM.png)
#### What are the relevant issue numbers?
Closes #23025
See merge request !6716
|
|
Fix inconsistent highlighting of already selected activity nav-links
## What does this MR do?
* Remove edge case where user could deselect an activity nav-link (which seems to be returning all the events)
* Explicitly add an `All` tab to return all the events
## Are there points in the code the reviewer needs to double check?
Shouldn't be
## Why was this MR needed?
Resolves existing UI inconsistency
## Screenshots (if relevant)
Before:
![4OzkoQVJYc](/uploads/fd2a7fdbde2159e875482ec7b828fe60/4OzkoQVJYc.gif)
After:
![E0lj8UhEUU](/uploads/7eb5155861eb79d72957de04c9f172c9/E0lj8UhEUU.gif)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [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)
## What are the relevant issue numbers?
* Closes #21631
* Closes #21452
See merge request !6091
|
|
Link to Registry docs from project settings
Add an icon with a link to the docs from the project settings.
See merge request !6726
|
|
Update profile view
## What does this MR do?
Centers entire profile information section
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-10-03_at_4.23.03_PM](/uploads/bc2017e88cb52ec0e817c4c59e70a186/Screen_Shot_2016-10-03_at_4.23.03_PM.png)
After:
![Screen_Shot_2016-10-03_at_4.21.57_PM](/uploads/86ce1339d21cc39a64c22f27868a2986/Screen_Shot_2016-10-03_at_4.21.57_PM.png)
## 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
- [ ] 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 you do - 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?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22829
cc @dzaporozhets
See merge request !6662
|
|
Move user#show and group#show routing under root url
## What does this MR do?
Changes routing so user#show and group#show routing is under root url
## Are there points in the code the reviewer needs to double check?
no
## Why was this MR needed?
For nice and consistent routing for user/group show pages:
| before | after|
|---|---|
| `/u/dzaporozhets` | `/dzaporozhets`|
| `/dzaporozhets/gitlab-ce` |`/dzaporozhets/gitlab-ce`|
| `/u/dzaporozhets/snippets` |`/u/dzaporozhets/snippets`|
| `/groups/gitlab-org`| `/gitlab-org`|
| `/gitlab-org/gitlab-ce`| `/gitlab-org/gitlab-ce`|
| `/groups/gitlab-org/issues `| `/groups/gitlab-org/issues `|
So show page for user and group shown as `/:name` which is much nicer than before. At same time all nested pages like group issues stays under REST `/groups/:name/issues` so we don't need to introduce extra name restrictions ( ex. case when group has project with name "issues")
## 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
- [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 you do - 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?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3620
See merge request !6686
|
|
|
|
Improve issue load time performance by avoiding ORDER BY in find_by call
See merge request !6724
|
|
|
|
Replace bootstrap caret with fontawesome caret
## What does this MR do?
1. Replaces all occurrences of `.caret` with fontawesome's caret (`fa-caret-down` for most cases)
2. Remove `.caret` from CSS
3. Refactored pipeline graph toggle to display the correct fontawesome caret (Had to change some JavaScript for this)
## Are there points in the code the reviewer needs to double check?
* Need to check if I missed any pages :disappointed_relieved: or for any side effects
## Why was this MR needed?
Resolves UI inconsistency
## Screenshots (if relevant)
Before (1 example out of many):
![Screen_Shot_2016-09-12_at_3.49.58_PM](/uploads/5eb93bbcc00412a5875e39302f4d8ba0/Screen_Shot_2016-09-12_at_3.49.58_PM.png)
After:
![Screen_Shot_2016-09-12_at_3.49.48_PM](/uploads/9259a9ebfb0bd09b4cfd55674e9b8be4/Screen_Shot_2016-09-12_at_3.49.48_PM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [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 you do - 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 #21169
See merge request !6314
|
|
The Sortable concern has a default scope that adds ORDER BY to all
queries. EXPLAIN ANALYZE shows that this additional ORDER BY statement
causes the SQL optimizer to use the wrong index, which leads to a load
time of 2.9 s vs 0.073 ms just for the SELECT call. The minimal
change here is to re-implement find_by using where and reorder to
remove the ORDER BY clause in IssuesController#index.
Closes #23075
|
|
|
|
|
|
|
|
Adds tests for:
- external_url link in environmnets list
- must show deployment internal id in environments list
- must show build name and id in environments list
|
|
Only hide deploy status external link on x-small screens.
## What does this MR do?
Fixes [a regression](https://gitlab.com/gitlab-org/gitlab-ce/commit/03ea01946524a74773b24430c81804c2724b84b6#68dead621eaa630b5150a4d71b59fa3cd19030fd_57_50) where the deploy status widget hides only the text within the widget, and only for screens within bootstrap's 'small' range (≥544px - <768px).
## Are there points in the code the reviewer needs to double check?
I changed the viewport width range to hide the widget from `sm` to `xs` because when the external link is removed, it seems to fit comfortably even on xs viewports.
Given that we were already hiding the external link (along with all of the deploy text) on `sm` viewports, I assume it's okay to hide the external link still, instead of wrapping it to a new line.
We could remove the conditional hiding altogether though, and allow the external link to wrap. Definitely doesn't look as nice, but if it's important to show the external link along with the deploy status, we could make it look better when it wraps.
## Why was this MR needed?
Looked buggy, and prevented context being given for build passed icon on smaller screens.
## Screenshots (if relevant)
Before:
![57efae92cd57c192075546](/uploads/22b278756de4ca6ab3949a4a9692994e/57efae92cd57c192075546.gif)
After:
![57efaeb41b211194979047](/uploads/b178ddfbbdcfe74d2ce9f52e989a6878/57efaeb41b211194979047.gif)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [ ] 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 you do - 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?
https://gitlab.com/gitlab-org/gitlab-ce/issues/22778
cc: @jschatz1
See merge request !6633
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
|
|
Issue boards new issue form
## What does this MR do?
Adds a new issue form into the issue boards lists.
## Screenshots (if relevant)
![Screen_Shot_2016-10-03_at_14.57.30](/uploads/17fe6cd37bd020a2ee1688e0b496c18f/Screen_Shot_2016-10-03_at_14.57.30.png)
![Screen_Shot_2016-10-03_at_14.57.32](/uploads/c3f12bcb9ff9a0e7ce5b0bb06dfb0dd7/Screen_Shot_2016-10-03_at_14.57.32.png)
## What are the relevant issue numbers?
Part of #21219
See merge request !6653
|
|
Revert "Label list shows all issues (opened or closed) with that label"
## What does this MR do?
Revert changes made on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5991. Reasoning here: https://gitlab.com/gitlab-org/gitlab-ce/issues/21691#note_16516861
## Does this MR meet the acceptance criteria?
- [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [X] Added for this feature/bug
- [ ] 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)
- [ ] 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)
## What are the relevant issue numbers?
Closes #21691
See merge request !6695
|
|
|
|
|
|
|
|
MergeRequest new form load diff asynchronously
## What does this MR do?
Don't return diff tab content from the server when request for a new merge request
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
To avoid 502 errors due to this controller action takes to much time
## What are the relevant issue numbers?
Relates #13912
## 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
- [x] 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)
See merge request !5844
|
|
|
|
See !6096.
|
|
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
visible in environments list.
Allows a class as an option to keep the hidden avatar behaviour in all the places it is needed.
|