| Age | Commit message (Collapse) | Author |
|---|
|
Currently comments on commits and merge requests do not require merge request- or commit-specific information, but can use the same template. Rather than change the method which calls the template, I opted to keep the templates separate and create a new template to highlight their identicality, while preserving the option to distinguish them from each other in the future.
Also removed some of the inconsistencies between text and html email versions.
Still needed is a text-only version of git diffs and testing.
|
|
* upstream/master: (70 commits)
Fix routing spec for group controller
Add small improvements to constrainers and specs
Faster search
Fix broken commits search
Changed helper method to check for none on params Moved if statements around in view
API: Return 400 when creating a systemhook fails
Update non-exist group spinach test to match routing
Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2
Replace trigger with the new ID of the docs project
Refactor method name
17492 Update link color for more accessible contrast
Fixed todos empty state when filtering
Refactor namespace regex
implements reset incoming email token on issues modal and account page, reactivates all tests and writes more tests for it
Use separate email-friendly token for incoming email and let incoming email token be reset
Use the Gitlab Workhorse HTTP header in the admin dashboard
Refactor project routing
Fix 404 when visit /projects page
Rewritten spinach git_blame tests to rspec feature tests
Add tests for project#index routing
...
|
|
|
|
We use bcc here because we don't want to generate this emails for a
thousand times. This could be potentially expensive in a loop, and
recipients would contain all project watchers so it could be a lot.
|
|
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16963209
|
|
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16956802
|
|
pipeline emails
|
|
|
|
|
|
|
|
* upstream/master: (372 commits)
Enable Lint/StringConversionInInterpolation cop and autocorrect offenses
resolve duplicated changelog entry
credit myself :smile:
change determine conditions
override subject method in devise mailer
follow the styleguide: Don't use parentheses around a literal
wrap subject with method subject
move spec back into shared example `an email sent from GitLab`
stub config settings in spec
remove empty line at block body end
remove extra entry
create new test in `spec/mailers/notify_spec.rb`
move changelog to 8.13
add configurable email subject suffix
Fixes sidebar navigation.
Convert "SSH Keys" Spinach features to RSpec
Enable import/export back for non-admins
Update gitlab-shell to 3.6.3
Updated artwork of empty group state.
Better empty state for Groups view.
...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* upstream/master: (206 commits)
Implement fourth round of comments from @DouweM.
Fix `CreateDeploymentService` spec.
Reload issues in spec to ensure label<->issue mapping properly loaded
Fix build.
Remove unnecessary #{} in cycle analytics template.
Update cycle analytics icon and fix color of the dismiss button.
Use triple dashes for the empty value in cycle analytics.
Fix typo on cycle analytics copy.
Add page title and fix sub menu width in Cycle Analytics page.
Update Cycle Analytics Read more link URL.
Display the cycle analytics navbar based on the `:read_cycle_analytics` ability.
Improve indentation in `Gitlab::Database::Median`
Add a spec for merge request metric caching while refreshing a merge request from a forked project.
Use the `IssuableBaseService` lifecycle hooks to cache `MergeRequestsClosingIssues`
Implement a second round of review comments from @DouweM.
Add docs on Cycle Analytics
Test if issue authors can access private projects
Update .pkgr.yml with Ubuntu 16.04 dependencies
fix issues mr counter
Move JSON generation (cycle analytics) into a controller method.
...
|
|
* Created a force=true param that will continue with the previous
behaviour of the unsubscribe method
* Created a filter for not-logged users so they see a unsubsribe
confirmation page
* Added the List-Unsubscribe header on emails so the email client can
display it on top
|
|
|
|
* upstream/master: (671 commits)
Only check :can_resolve permission if the note is resolvable
Use Search::GlobalService.new in the `GET /projects/search/:query` endpoint
Improve PipelinesFinder spec so that it does not depend on hard-coded database IDs
Add changelogs/unreleased/.gitkeep
Archive CHANGELOG entries prior to 8.0 in changelogs/archive.md
Request only the LDAP attributes we need
Add notification_settings API calls Use NotificationSetting::EMAIL_EVENTS for params
Pull import sources from Gitlab::ImportSources
Fix API issues sorting
Use gitlab-workhorse 0.8.1
Update CHANGELOG
Avoid conflict with admin labels when importing GitHub labels
Search should compare only the lowercase versions of the project names
Enable pipeline events by default
Minor update on CI docs examples
Move write_note into SlashCommandsHelper and update other dependent specs
Wait for logout message in login_helpers
Use wait_for_ajax to avoid database deadlocks after specs are cleaned
Fix spec failures with spec/features/issues/user_uses_slash_commands_spec.rb
Require comments must be included before code
...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Extract diff line data attributes to helper methods
|
|
|
|
A project in a group can have no explicit owners/masters,
in that case we fallbacks to the group's owners/masters.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
+ Move 'Edit Project/Group' out of membership-related partial
+ Show the access request buttons only to logged-in users
+ Put the request access buttons out of in a more visible button
+ Improve the copy in the #remove_member_message helper
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
|
|
The repository push email can be very expensive to generate, especially
with syntax-highlighted diffs. Instead of generating the email for each
recipient, generate one email object and reset the Message-Id and To
headers for each recipient. (Cloning would also be expensive in the case
of large emails, although probably not as bad as generating from
scratch.)
|
|
Closes #2334
|
|
use ! rather than # for merge request references
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278
See merge request !3740
|
|
|
|
|
|
|
|
|
