* upstream/master:
Add notification_settings:events to schema
Fixed mobile styling
Set path for pinned nav cookie
Fixed placement of close button on merge requests
using request dot path instead
Turn note into normal text
Document environments and deployments
Tweak grammar
fix double query string in url
Broken instructions. git fetch --all --tags doesn't refresh tags
Fixed placement of close button on merge requests
## What does this MR do?
Fixes the order in which the MR buttons appear
## Screenshots (if relevant)
See merge request !4778
Fix double query string in url
This MR should fix the double query string in url that shows up while using the "filter by name .." input on projects list pages and also closes [17743](https://gitlab.com/gitlab-org/gitlab-ce/issues/17743)
Closes#17743
See merge request !4480
Set path for pinned nav cookie
## What does this MR do?
Sets a path for the pinned nav cookie so it will be present across page reload.
Closes#18836
See merge request !4784
* upstream/master: (353 commits)
Put some admin settings in dropdown
Add styleguide on configuration settings documentation
Remove Duplicated keys add UNIQUE index to fingerprint
Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
Move appearance settings as sub tab to application settings
use rails root join
fixed a couple of errors spotted in production
Fix RangeError exceptions when referring to issues or merge requests outside of max database values
Fix bug in `WikiLinkFilter`.
Grammar and typographic changes to artifacts documentation
Tweak grammar
Small frontend code fixes and restore 8a2d88f commit
Warn about admin privilege to disable GitHub Webhooks
Listing GH Webhooks doesn't stop import process for non GH admin users
fixup! updated docs for api endpoint award emoji
Update CHANGELOG
Ensure Todos counters doesn't count Todos for projects pending delete
Add endpoints for award emoji on notes
Sort API endpoints and implement feedback
Add endpoints for Award Emoji
...
Fix RangeError exceptions when referring to issues or merge requests outside of max database values
When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values.
Closes#18777
See merge request !4777
When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we
get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method
that will throw out out-of-bounds values.
Closes#18777
Display Star and Fork on mobile, fix#18537.
## What does this MR do?
Displays the Star and Fork buttons on mobile devices.
## Are there points in the code the reviewer needs to double check?
Nope.
## Why was this MR needed?
I wanted to star and/or fork projects while on my phone, I couldn't do that before.
## What are the relevant issue numbers?
#18537
## Screenshots (if relevant)
cc: @jschatz1
See merge request !4714
Add merge request data to the progress information on Milestones pages.
## What does this MR do?
Adds data about merge requests to the Milestone show view. It previously only showed something like `3 issues: 2 open and 1 closed 20% complete`, now it shows `3 issues: 2 open and 1 closed 2 merge requests: 2 open and 0 merged 20% complete`.
## Are there points in the code the reviewer needs to double check?
I don't think so.
## Why was this MR needed?
The milestone progress % didn't accurately reflect the open/merged MRs.
## What are the relevant issue numbers?
Fixes#13980
## Screenshots (if relevant)
Before:
After:
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [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 !4719
Fix margin & padding on activity btn
## What does this MR do?
Fixes alignment of activity btn
## What are the relevant issue numbers?
Closes#18762
## Screenshots (if relevant)
See merge request !4750
Fixed alignment of buttons in note forms
## What does this MR do?
Due to a CSS change on some buttons, the alignment of the save button on the note form went off. Also, it made no sense to have `.btn-grouped` as the button wasn't in a group.
## Screenshots (if relevant)
See merge request !4740
Fixed tooltip placement on edit tags button
## What does this MR do?
Moves the placement of the tooltip to the body so not to affect the movement of the button.
## Screenshots (if relevant)
Old:
New:
See merge request !4737
Fixed size of buttons in branches list
## What does this MR do?
The buttons on the branch list were using `btn-xs` this MR removes that so the buttons are a normal size to match https://gitlab.com/gitlab-org/gitlab-ce/tags
## What are the relevant issue numbers?
#18677
## Screenshots (if relevant)
See merge request !4735
Aligns create merge request button vertically
## What does this MR do?
Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4644#note_12507178 I have vertically aligned the button correctly.
## Screenshots (if relevant)
Here is my awesome screenshot to show it is centered vertically
See merge request !4733
Implement custom notification level options
part of #12758
See merge request !4389
Ensure that group owner cannot request access to a project of their group
## What does this MR do?
It fixes two things:
- 91ad995d69e1a0f8991fd896f1d9febc109273fe Ensure that group owner cannot request access to a project of their group
- ec3ff061148d556757e7cd486cdc6083d77acf34 Ensure group/project owners can see their members' access_level (see the commit message for details)
## Are there points in the code the reviewer needs to double check?
Not really, these are pretty simple fixes.
## Why was this MR needed?
Because there was an issue created!
## What are the relevant issue numbers?
Fixes#18717.
## Does this MR meet the acceptance criteria?
- [x] CHANGELOG is not needed since the bug is only present in a 8.9 RC
- [x] 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 !4729
Ensure Todos counters doesn't count Todos for projects pending delete
Use `TodosFinder` instead of `current_user.todos` to filter projects
pending delete on Todos counters helpers.
Counters should not reflect the number of Todos displayed on the tabs.
Fixes#18633
See merge request !4663
Disable the unlink feature for SAML connected accounts (social login).
This disables the ability to manually unlink your SAML account, if you have one connected. In certain scenarios, the only allowed login mechanism can be SAML, and if you unlink your account you will be locked out of the system (configuration dependent).
Fixes#18613
See merge request !4662
Do not check repos without push events
Reduce false positives from automatic repository checks by skipping
projects without push events.
See merge request !4684
- As todos are created/updated inside the TodoService
we repopulate the cache just there for both pending/done todos
- Todos as mark as done from the TodosController we update cache
there too
- All the added methods are kept in the User class for cohesion
Lin Jen-Shin
Jacob Schatz
Robert Speicher
Yorick Peterse
Dmitriy Zaporozhets
Paco Guzman
Phil Hughes
James Lopez
Stan Hu
Douwe Maan
Felipe Artur
Douwe Maan
Douglas Barbosa Alexandre
Connor Shea
barthc
Rémy Coutable