Download as
Browse Code »

Commit 98c5912aaac4eb408e90feb6c9ad4b293e692974

Authored by Dmitriy Zaporozhets
2 parents 931e6a72 71e92681
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'make-gender-neutral' of /home/git/repositories/gitlab/gitlabhq

Showing 5 changed files with 20 additions and 20 deletions   Show diff stats
@@ -67,7 +67,7 @@ v 6.2.0 @@ -67,7 +67,7 @@ v 6.2.0
67 - Avatar upload on profile page with a maximum of 100KB (Steven Thonus) 67 - Avatar upload on profile page with a maximum of 100KB (Steven Thonus)
68 - Store the sessions in Redis instead of the cookie store 68 - Store the sessions in Redis instead of the cookie store
69 - Fixed relative links in markdown 69 - Fixed relative links in markdown
70 - - User must confirm his email if signup enabled 70 + - User must confirm their email if signup enabled
71 - User must confirm changed email 71 - User must confirm changed email
72 72
73 v 6.1.0 73 v 6.1.0
@@ -89,7 +89,7 @@ v 6.1.0 @@ -89,7 +89,7 @@ v 6.1.0
89 - Add links to create branch/tag from project home page 89 - Add links to create branch/tag from project home page
90 - Add public-project? checkbox to new-project view 90 - Add public-project? checkbox to new-project view
91 - Improved compare page. Added link to proceed into Merge Request 91 - Improved compare page. Added link to proceed into Merge Request
92 - - Send email to user when he was added to group 92 + - Send an email to a user when they are added to group
93 - New landing page when you have 0 projects 93 - New landing page when you have 0 projects
94 94
95 v 6.0.0 95 v 6.0.0
app/services/notification_service.rb
  Diff comments   View file @98c5912
@@ -19,7 +19,7 @@ class NotificationService @@ -19,7 +19,7 @@ class NotificationService
19 19
20 # When create an issue we should send next emails: 20 # When create an issue we should send next emails:
21 # 21 #
22 - # * issue assignee if his notification level is not Disabled 22 + # * issue assignee if their notification level is not Disabled
23 # * project team members with notification level higher then Participating 23 # * project team members with notification level higher then Participating
24 # 24 #
25 def new_issue(issue, current_user) 25 def new_issue(issue, current_user)
@@ -28,8 +28,8 @@ class NotificationService @@ -28,8 +28,8 @@ class NotificationService
28 28
29 # When we close an issue we should send next emails: 29 # When we close an issue we should send next emails:
30 # 30 #
31 - # * issue author if his notification level is not Disabled  
32 - # * issue assignee if his notification level is not Disabled 31 + # * issue author if their notification level is not Disabled
  32 + # * issue assignee if their notification level is not Disabled
33 # * project team members with notification level higher then Participating 33 # * project team members with notification level higher then Participating
34 # 34 #
35 def close_issue(issue, current_user) 35 def close_issue(issue, current_user)
@@ -38,8 +38,8 @@ class NotificationService @@ -38,8 +38,8 @@ class NotificationService
38 38
39 # When we reassign an issue we should send next emails: 39 # When we reassign an issue we should send next emails:
40 # 40 #
41 - # * issue old assignee if his notification level is not Disabled  
42 - # * issue new assignee if his notification level is not Disabled 41 + # * issue old assignee if their notification level is not Disabled
  42 + # * issue new assignee if their notification level is not Disabled
43 # 43 #
44 def reassigned_issue(issue, current_user) 44 def reassigned_issue(issue, current_user)
45 reassign_resource_email(issue, issue.project, current_user, 'reassigned_issue_email') 45 reassign_resource_email(issue, issue.project, current_user, 'reassigned_issue_email')
@@ -48,7 +48,7 @@ class NotificationService @@ -48,7 +48,7 @@ class NotificationService
48 48
49 # When create a merge request we should send next emails: 49 # When create a merge request we should send next emails:
50 # 50 #
51 - # * mr assignee if his notification level is not Disabled 51 + # * mr assignee if their notification level is not Disabled
52 # 52 #
53 def new_merge_request(merge_request, current_user) 53 def new_merge_request(merge_request, current_user)
54 new_resource_email(merge_request, merge_request.target_project, 'new_merge_request_email') 54 new_resource_email(merge_request, merge_request.target_project, 'new_merge_request_email')
@@ -56,8 +56,8 @@ class NotificationService @@ -56,8 +56,8 @@ class NotificationService
56 56
57 # When we reassign a merge_request we should send next emails: 57 # When we reassign a merge_request we should send next emails:
58 # 58 #
59 - # * merge_request old assignee if his notification level is not Disabled  
60 - # * merge_request assignee if his notification level is not Disabled 59 + # * merge_request old assignee if their notification level is not Disabled
  60 + # * merge_request assignee if their notification level is not Disabled
61 # 61 #
62 def reassigned_merge_request(merge_request, current_user) 62 def reassigned_merge_request(merge_request, current_user)
63 reassign_resource_email(merge_request, merge_request.target_project, current_user, 'reassigned_merge_request_email') 63 reassign_resource_email(merge_request, merge_request.target_project, current_user, 'reassigned_merge_request_email')
@@ -65,8 +65,8 @@ class NotificationService @@ -65,8 +65,8 @@ class NotificationService
65 65
66 # When we close a merge request we should send next emails: 66 # When we close a merge request we should send next emails:
67 # 67 #
68 - # * merge_request author if his notification level is not Disabled  
69 - # * merge_request assignee if his notification level is not Disabled 68 + # * merge_request author if their notification level is not Disabled
  69 + # * merge_request assignee if their notification level is not Disabled
70 # * project team members with notification level higher then Participating 70 # * project team members with notification level higher then Participating
71 # 71 #
72 def close_mr(merge_request, current_user) 72 def close_mr(merge_request, current_user)
@@ -75,8 +75,8 @@ class NotificationService @@ -75,8 +75,8 @@ class NotificationService
75 75
76 # When we merge a merge request we should send next emails: 76 # When we merge a merge request we should send next emails:
77 # 77 #
78 - # * merge_request author if his notification level is not Disabled  
79 - # * merge_request assignee if his notification level is not Disabled 78 + # * merge_request author if their notification level is not Disabled
  79 + # * merge_request assignee if their notification level is not Disabled
80 # * project team members with notification level higher then Participating 80 # * project team members with notification level higher then Participating
81 # 81 #
82 def merge_mr(merge_request) 82 def merge_mr(merge_request)
config/initializers/devise.rb
  Diff comments   View file @98c5912
@@ -74,8 +74,8 @@ Devise.setup do |config| @@ -74,8 +74,8 @@ Devise.setup do |config|
74 # config.pepper = "2ef62d549c4ff98a5d3e0ba211e72cff592060247e3bbbb9f499af1222f876f53d39b39b823132affb32858168c79c1d7741d26499901b63c6030a42129924ef" 74 # config.pepper = "2ef62d549c4ff98a5d3e0ba211e72cff592060247e3bbbb9f499af1222f876f53d39b39b823132affb32858168c79c1d7741d26499901b63c6030a42129924ef"
75 75
76 # ==> Configuration for :confirmable 76 # ==> Configuration for :confirmable
77 - # The time you want to give your user to confirm his account. During this time  
78 - # he will be able to access your application without confirming. Default is 0.days 77 + # The time you want to give a user to confirm their account. During this time
  78 + # they will be able to access your application without confirming. Default is 0.days
79 # When confirm_within is zero, the user won't be able to sign in without confirming. 79 # When confirm_within is zero, the user won't be able to sign in without confirming.
80 # You can use this to let your user access some features of your application 80 # You can use this to let your user access some features of your application
81 # without confirming the account, but blocking it after a certain period 81 # without confirming the account, but blocking it after a certain period
doc/api/projects.md
  Diff comments   View file @98c5912
@@ -478,7 +478,7 @@ Parameters: @@ -478,7 +478,7 @@ Parameters:
478 "id":"3f94fc7c85061973edc9906ae170cc269b07ca55" 478 "id":"3f94fc7c85061973edc9906ae170cc269b07ca55"
479 }], 479 }],
480 "tree": "c68537c6534a02cc2b176ca1549f4ffa190b58ee", 480 "tree": "c68537c6534a02cc2b176ca1549f4ffa190b58ee",
481 - "message":"give caolan his credit where it's due (up top)", 481 + "message":"give caolan credit where it's due (up top)",
482 "author": { 482 "author": {
483 "name":"Jeremy Ashkenas", 483 "name":"Jeremy Ashkenas",
484 "email":"jashkenas@example.com" 484 "email":"jashkenas@example.com"
lib/gitlab/ldap/user.rb
  Diff comments   View file @98c5912
@@ -23,8 +23,8 @@ module Gitlab @@ -23,8 +23,8 @@ module Gitlab
23 # Look for user with same emails 23 # Look for user with same emails
24 # 24 #
25 # Possible cases: 25 # Possible cases:
26 - # * When user already has account and need to link his LDAP account.  
27 - # * LDAP uid changed for user with same email and we need to update his uid 26 + # * When user already has account and need to link their LDAP account.
  27 + # * LDAP uid changed for user with same email and we need to update their uid
28 # 28 #
29 user = find_user(email) 29 user = find_user(email)
30 30
@@ -47,7 +47,7 @@ module Gitlab @@ -47,7 +47,7 @@ module Gitlab
47 user = model.find_by_email(email) 47 user = model.find_by_email(email)
48 48
49 # If no user found and allow_username_or_email_login is true 49 # If no user found and allow_username_or_email_login is true
50 - # we look for user by extracting part of his email 50 + # we look for user by extracting part of their email
51 if !user && email && ldap_conf['allow_username_or_email_login'] 51 if !user && email && ldap_conf['allow_username_or_email_login']
52 uname = email.partition('@').first 52 uname = email.partition('@').first
53 user = model.find_by_username(uname) 53 user = model.find_by_username(uname)