Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
71e92681
Commit
71e92681
authored
11 years ago
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
We welcome everyone to contribute.
parent
931e6a72
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
20 deletions
+20
-20
CHANGELOG
CHANGELOG
+2
-2
app/services/notification_service.rb
app/services/notification_service.rb
+12
-12
config/initializers/devise.rb
config/initializers/devise.rb
+2
-2
doc/api/projects.md
doc/api/projects.md
+1
-1
lib/gitlab/ldap/user.rb
lib/gitlab/ldap/user.rb
+3
-3
No files found.
CHANGELOG
View file @
71e92681
...
...
@@ -67,7 +67,7 @@ v 6.2.0
- Avatar upload on profile page with a maximum of 100KB (Steven Thonus)
- Store the sessions in Redis instead of the cookie store
- Fixed relative links in markdown
- User must confirm
his
email if signup enabled
- User must confirm
their
email if signup enabled
- User must confirm changed email
v 6.1.0
...
...
@@ -89,7 +89,7 @@ v 6.1.0
- Add links to create branch/tag from project home page
- Add public-project? checkbox to new-project view
- Improved compare page. Added link to proceed into Merge Request
- Send
email to user when he was
added to group
- Send
an email to a user when they are
added to group
- New landing page when you have 0 projects
v 6.0.0
...
...
This diff is collapsed.
Click to expand it.
app/services/notification_service.rb
View file @
71e92681
...
...
@@ -19,7 +19,7 @@ class NotificationService
# When create an issue we should send next emails:
#
# * issue assignee if
his
notification level is not Disabled
# * issue assignee if
their
notification level is not Disabled
# * project team members with notification level higher then Participating
#
def
new_issue
(
issue
,
current_user
)
...
...
@@ -28,8 +28,8 @@ class NotificationService
# When we close an issue we should send next emails:
#
# * issue author if
his
notification level is not Disabled
# * issue assignee if
his
notification level is not Disabled
# * issue author if
their
notification level is not Disabled
# * issue assignee if
their
notification level is not Disabled
# * project team members with notification level higher then Participating
#
def
close_issue
(
issue
,
current_user
)
...
...
@@ -38,8 +38,8 @@ class NotificationService
# When we reassign an issue we should send next emails:
#
# * issue old assignee if
his
notification level is not Disabled
# * issue new assignee if
his
notification level is not Disabled
# * issue old assignee if
their
notification level is not Disabled
# * issue new assignee if
their
notification level is not Disabled
#
def
reassigned_issue
(
issue
,
current_user
)
reassign_resource_email
(
issue
,
issue
.
project
,
current_user
,
'reassigned_issue_email'
)
...
...
@@ -48,7 +48,7 @@ class NotificationService
# When create a merge request we should send next emails:
#
# * mr assignee if
his
notification level is not Disabled
# * mr assignee if
their
notification level is not Disabled
#
def
new_merge_request
(
merge_request
,
current_user
)
new_resource_email
(
merge_request
,
merge_request
.
target_project
,
'new_merge_request_email'
)
...
...
@@ -56,8 +56,8 @@ class NotificationService
# When we reassign a merge_request we should send next emails:
#
# * merge_request old assignee if
his
notification level is not Disabled
# * merge_request assignee if
his
notification level is not Disabled
# * merge_request old assignee if
their
notification level is not Disabled
# * merge_request assignee if
their
notification level is not Disabled
#
def
reassigned_merge_request
(
merge_request
,
current_user
)
reassign_resource_email
(
merge_request
,
merge_request
.
target_project
,
current_user
,
'reassigned_merge_request_email'
)
...
...
@@ -65,8 +65,8 @@ class NotificationService
# When we close a merge request we should send next emails:
#
# * merge_request author if
his
notification level is not Disabled
# * merge_request assignee if
his
notification level is not Disabled
# * merge_request author if
their
notification level is not Disabled
# * merge_request assignee if
their
notification level is not Disabled
# * project team members with notification level higher then Participating
#
def
close_mr
(
merge_request
,
current_user
)
...
...
@@ -75,8 +75,8 @@ class NotificationService
# When we merge a merge request we should send next emails:
#
# * merge_request author if
his
notification level is not Disabled
# * merge_request assignee if
his
notification level is not Disabled
# * merge_request author if
their
notification level is not Disabled
# * merge_request assignee if
their
notification level is not Disabled
# * project team members with notification level higher then Participating
#
def
merge_mr
(
merge_request
)
...
...
This diff is collapsed.
Click to expand it.
config/initializers/devise.rb
View file @
71e92681
...
...
@@ -74,8 +74,8 @@ Devise.setup do |config|
# config.pepper = "2ef62d549c4ff98a5d3e0ba211e72cff592060247e3bbbb9f499af1222f876f53d39b39b823132affb32858168c79c1d7741d26499901b63c6030a42129924ef"
# ==> Configuration for :confirmable
# The time you want to give
your user to confirm his
account. During this time
#
he
will be able to access your application without confirming. Default is 0.days
# The time you want to give
a user to confirm their
account. During this time
#
they
will be able to access your application without confirming. Default is 0.days
# When confirm_within is zero, the user won't be able to sign in without confirming.
# You can use this to let your user access some features of your application
# without confirming the account, but blocking it after a certain period
...
...
This diff is collapsed.
Click to expand it.
doc/api/projects.md
View file @
71e92681
...
...
@@ -478,7 +478,7 @@ Parameters:
"id"
:
"3f94fc7c85061973edc9906ae170cc269b07ca55"
}],
"tree"
:
"c68537c6534a02cc2b176ca1549f4ffa190b58ee"
,
"message"
:
"give caolan
his
credit where it's due (up top)"
,
"message"
:
"give caolan credit where it's due (up top)"
,
"author"
:
{
"name"
:
"Jeremy Ashkenas"
,
"email"
:
"jashkenas@example.com"
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/ldap/user.rb
View file @
71e92681
...
...
@@ -23,8 +23,8 @@ module Gitlab
# Look for user with same emails
#
# Possible cases:
# * When user already has account and need to link
his
LDAP account.
# * LDAP uid changed for user with same email and we need to update
his
uid
# * When user already has account and need to link
their
LDAP account.
# * LDAP uid changed for user with same email and we need to update
their
uid
#
user
=
find_user
(
email
)
...
...
@@ -47,7 +47,7 @@ module Gitlab
user
=
model
.
find_by_email
(
email
)
# If no user found and allow_username_or_email_login is true
# we look for user by extracting part of
his
email
# we look for user by extracting part of
their
email
if
!
user
&&
email
&&
ldap_conf
[
'allow_username_or_email_login'
]
uname
=
email
.
partition
(
'@'
).
first
user
=
model
.
find_by_username
(
uname
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment