Support e-mail notifications for comments on project snippets
While working with project snippets recently, I noticed that notifications would not be sent out for comments on notes. This MR fixes this.
Note: I'm not completely sure why `ProjectSnippets#participants` returns an empty array if you don't include the concern that is already in `Snippets` but didn't dig into it any more.
Closes#2334
See merge request !3987
Fix "remember me" sign in option
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4006
Prior to this change, 'remember me' was effectively always on because
the `_gitlab_session` cookie was always made persistent. With this
change it becomes possible again to have `_gitlab_session`be a session
cookie when 'remember me' is unchecked.
See merge request !4004
Backported minimal safewebhook implementation to GitLab CE
This brings a minimal implementation for gitlab-org/gitlab-ce#13478
backported from EE (gitlab-org/gitlab-ee!334).
Also added UI to configure Secret Token
Fixes#15365.
See merge request !3940
Fix the GitHub Omniauth instructions
Technically the screenshot is also out of date, but I honestly don't care enough to go through the effort of making a sample application, taking a screenshot, etc.
See merge request !3976
Add more parameters to the filter_parameters config.
Adds Sentry DSN, Webhooks, Deploy Keys, etc.
Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences.
This also seems to be the more popular syntax for adding new parameters, from what I can find.
In the future we may want to [increase the specificity of some of these](http://blog.bigbinary.com/2016/03/07/parameter-filtering-enhacement-rails-5.html) once Rails 5 is out. e.g. instead of `:hook`, `"hook.url"` would be just as effective without removing potentially useful information from the logs.
cc: @stanhu
See merge request !3971
Adds Sentry DSN, Webhooks, Deploy Keys, etc.
Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences.
This also seems to be the more popular syntax for adding new parameters, from what I can find.
This changes 4 things:
1. Project#protected_branches_names has been renamed to
Project#protected_branch_names.
2. Project#open_branches uses a Set for the branch names as checking
values in a Set is faster than checking values in a (large) Array.
3. Some redundant code in Project#open_branches has been removed.
4. Project#protected_branch_names now uses #pluck instead of #map,
removing the need for loading entire DB records into memory.
This changes Project#protected_branch? to use a query to check if a
branch is protected, instead of loading all ProtectedBranch records into
memory just to check if the list of names includes a given branch name.
Upgrade Doorkeeper from 2.2.2 to 3.1.0
I’d rather upgrade one major version at a time, so Doorkeeper needs to
be upgraded to 3.x before it can be upgraded to 4.x (which includes
Rails 5 support).
Changelog:
https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#310
Working toward #14286.
See merge request !3644
Move modal css to separate file and fix danger text for confirmation modal
* in help file I found css for modal that affect whole application -> moved to separate file
* fixed ugly confirmation message when remove project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !3979
Removes duplicates from the label dropdown
It concats the duplicate labels into a single label in the dropdown with the color being a gradient of the differnet colors being concatted.
I liked your idea @jschatz1 of using a standard icon color. However, with this i've taken all the duplicated colors & made a little gradient with them so it still half resembles the label colors (this has been limited to 4 or it could get crazy!)
Closes#16555, #14820
See merge request !3963
Updated spacing between notification label and button
Closes#16552
See merge request !3965
It concats the duplicate labels into a single label in the dropdown with
the color being a gradient of the differnet colors being concatted.
Closes#16555
Support supressing text file diffs on the default branch with .gitattributes
This change allows users to suppress diffs for text files by adding an entry to the `.gitattributes` file. To take effect the file present at the HEAD of the default branch.
When rendering a diff, if the file is text according to the charlock holmes gem (via the `text?` method) but the file is not diffable according to the project repository, then a message is displayed stating that the diff was suppressed.
I looked into ways to do this using a `binary` flag as suggested by @stanhu in [this comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/2315#note_4435454), however, there was no good way to seperate what was a real binary file from one that had been marked as not diffable in `.gitattributes`.
Fixes and closes gitlab-org/gitlab-ce#2315.
See merge request !3806
This is a combination of 3 commits.
- Update the bare repositories info/attributes if the default branch is updated
- Check the diff attributes of a file before showing a diff
- Update CHANGELOG
make some changes for the checks to determine when the messages should be displayed
add item to changelog and also integration test
make some changes to the test
make some changes
Load the "New Branch" button asynchronously
Here's how it looks like for logged in users:
And here it is for anonymous users (or when a new branch can't be created by a logged in user):
See merge request !3855
Robert Speicher
Robert Speicher
Stan Hu
Rémy Coutable
Jacob Vosmaer
Dmitriy Zaporozhets
Gabriel Mazetto
Achilleas Pipinellis
Grzegorz Bizon
Connor Shea
Yorick Peterse
Drew Blessing
Jacob Schatz
Jacob Schatz
Phil HughesandJacob Schatz
Matt Oakes
Arinde Eniola
Alex Jordan