Commit 31892227d7611c1818dbe94b360327e714106297
Exists in
master
and in
4 other branches
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Showing
6 changed files
with
27 additions
and
36 deletions
Show diff stats
CHANGELOG
| ... | ... | @@ -67,7 +67,7 @@ v 6.2.0 |
| 67 | 67 | - Avatar upload on profile page with a maximum of 100KB (Steven Thonus) |
| 68 | 68 | - Store the sessions in Redis instead of the cookie store |
| 69 | 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 | 71 | - User must confirm changed email |
| 72 | 72 | |
| 73 | 73 | v 6.1.0 |
| ... | ... | @@ -89,7 +89,7 @@ v 6.1.0 |
| 89 | 89 | - Add links to create branch/tag from project home page |
| 90 | 90 | - Add public-project? checkbox to new-project view |
| 91 | 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 | 93 | - New landing page when you have 0 projects |
| 94 | 94 | |
| 95 | 95 | v 6.0.0 | ... | ... |
README.md
| ... | ... | @@ -44,32 +44,24 @@ |
| 44 | 44 | |
| 45 | 45 | ** More details are in the [requirements doc](doc/install/requirements.md) |
| 46 | 46 | |
| 47 | -### Installation | |
| 47 | +### Official installation methods | |
| 48 | 48 | |
| 49 | -#### Official production installation | |
| 49 | +* [Manual installation guide for a production server](doc/install/installation.md) | |
| 50 | 50 | |
| 51 | -* [Installation guide for a production server](doc/install/installation.md) | |
| 51 | +* [GitLab Chef Cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md) This cookbook can be used both for development installations and production installations. If you want to [contribute](CONTRIBUTE.md) to GitLab we suggest you follow the [development installation on a virtual machine with Vagrant](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/doc/development.md) instructions to install all testing dependencies. | |
| 52 | 52 | |
| 53 | +### Third party one-click installers | |
| 53 | 54 | |
| 54 | -#### Official development installation | |
| 55 | +* [Digital Ocean 1-Click Application Install](https://www.digitalocean.com/blog_posts/host-your-git-repositories-in-55-seconds-with-gitlab) Have a new server up in 55 seconds. Digital Ocean uses SSD disks which is great for an IO intensive app such as GitLab. | |
| 55 | 56 | |
| 56 | -If you want to contribute, please first read our [Contributing Guidelines](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) and then we suggest you to use the Vagrant virtual machine project to get an environment working with all dependencies. | |
| 57 | +* [BitNami one-click installers](http://bitnami.com/stack/gitlab) This package contains both GitLab and GitLab CI. It is available as installer, virtual machine or for cloud hosting providers (Amazon Web Services/Azure/etc.). | |
| 57 | 58 | |
| 58 | -* [Vagrant virtual machine for development](https://github.com/gitlabhq/gitlab-vagrant-vm) | |
| 59 | - | |
| 60 | - | |
| 61 | -#### Unofficial production installations | |
| 59 | +#### Unofficial installation methods | |
| 62 | 60 | |
| 63 | 61 | * [GitLab recipes](https://github.com/gitlabhq/gitlab-recipes) repository with unofficial guides for using GitLab with different software (operating systems, webservers, etc.) than the official version. |
| 64 | 62 | |
| 65 | 63 | * [Installation guides](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Unofficial-Installation-Guides) public wiki with unofficial guides to install GitLab on different operating systems. |
| 66 | 64 | |
| 67 | - | |
| 68 | -* [Digital Ocean 1-Click Application Install](https://www.digitalocean.com/) Have a new server up in 55 seconds. Digital Ocean uses SSD disks which is great for an IO intensive app as GitLab. Look for GitLab under 'Select Image' => 'Applications' when creating a droplet. | |
| 69 | - | |
| 70 | -* [BitNami one-click installers](http://bitnami.com/stack/gitlab) Get an image with GitLab and GitLab CI preinstalled for Amazon Web Services, Azure, VMware or your local server. | |
| 71 | - | |
| 72 | - | |
| 73 | 65 | ### New versions and upgrading |
| 74 | 66 | |
| 75 | 67 | Since 2011 GitLab is released on the 22nd of every month. Every new release includes an upgrade guide. |
| ... | ... | @@ -80,7 +72,6 @@ Since 2011 GitLab is released on the 22nd of every month. Every new release incl |
| 80 | 72 | |
| 81 | 73 | * Features that will be in the next releases are listed on [the feedback and suggestions forum](http://feedback.gitlab.com/forums/176466-general) with the status [started](http://feedback.gitlab.com/forums/176466-general/status/796456) and [completed](http://feedback.gitlab.com/forums/176466-general/status/796457). |
| 82 | 74 | |
| 83 | - | |
| 84 | 75 | ### Run in production mode |
| 85 | 76 | |
| 86 | 77 | The Installation guide contains instructions on how to download an init script and run it automatically on boot. You can also start the init script manually: | ... | ... |
app/services/notification_service.rb
| ... | ... | @@ -19,7 +19,7 @@ class NotificationService |
| 19 | 19 | |
| 20 | 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 | 23 | # * project team members with notification level higher then Participating |
| 24 | 24 | # |
| 25 | 25 | def new_issue(issue, current_user) |
| ... | ... | @@ -28,8 +28,8 @@ class NotificationService |
| 28 | 28 | |
| 29 | 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 | 33 | # * project team members with notification level higher then Participating |
| 34 | 34 | # |
| 35 | 35 | def close_issue(issue, current_user) |
| ... | ... | @@ -38,8 +38,8 @@ class NotificationService |
| 38 | 38 | |
| 39 | 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 | 44 | def reassigned_issue(issue, current_user) |
| 45 | 45 | reassign_resource_email(issue, issue.project, current_user, 'reassigned_issue_email') |
| ... | ... | @@ -48,7 +48,7 @@ class NotificationService |
| 48 | 48 | |
| 49 | 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 | 53 | def new_merge_request(merge_request, current_user) |
| 54 | 54 | new_resource_email(merge_request, merge_request.target_project, 'new_merge_request_email') |
| ... | ... | @@ -56,8 +56,8 @@ class NotificationService |
| 56 | 56 | |
| 57 | 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 | 62 | def reassigned_merge_request(merge_request, current_user) |
| 63 | 63 | reassign_resource_email(merge_request, merge_request.target_project, current_user, 'reassigned_merge_request_email') |
| ... | ... | @@ -65,8 +65,8 @@ class NotificationService |
| 65 | 65 | |
| 66 | 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 | 70 | # * project team members with notification level higher then Participating |
| 71 | 71 | # |
| 72 | 72 | def close_mr(merge_request, current_user) |
| ... | ... | @@ -75,8 +75,8 @@ class NotificationService |
| 75 | 75 | |
| 76 | 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 | 80 | # * project team members with notification level higher then Participating |
| 81 | 81 | # |
| 82 | 82 | def merge_mr(merge_request) | ... | ... |
config/initializers/devise.rb
| ... | ... | @@ -74,8 +74,8 @@ Devise.setup do |config| |
| 74 | 74 | # config.pepper = "2ef62d549c4ff98a5d3e0ba211e72cff592060247e3bbbb9f499af1222f876f53d39b39b823132affb32858168c79c1d7741d26499901b63c6030a42129924ef" |
| 75 | 75 | |
| 76 | 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 | 79 | # When confirm_within is zero, the user won't be able to sign in without confirming. |
| 80 | 80 | # You can use this to let your user access some features of your application |
| 81 | 81 | # without confirming the account, but blocking it after a certain period | ... | ... |
doc/api/projects.md
| ... | ... | @@ -478,7 +478,7 @@ Parameters: |
| 478 | 478 | "id":"3f94fc7c85061973edc9906ae170cc269b07ca55" |
| 479 | 479 | }], |
| 480 | 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 | 482 | "author": { |
| 483 | 483 | "name":"Jeremy Ashkenas", |
| 484 | 484 | "email":"jashkenas@example.com" | ... | ... |
lib/gitlab/ldap/user.rb
| ... | ... | @@ -23,8 +23,8 @@ module Gitlab |
| 23 | 23 | # Look for user with same emails |
| 24 | 24 | # |
| 25 | 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 | 29 | user = find_user(email) |
| 30 | 30 | |
| ... | ... | @@ -47,7 +47,7 @@ module Gitlab |
| 47 | 47 | user = model.find_by_email(email) |
| 48 | 48 | |
| 49 | 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 | 51 | if !user && email && ldap_conf['allow_username_or_email_login'] |
| 52 | 52 | uname = email.partition('@').first |
| 53 | 53 | user = model.find_by_username(uname) | ... | ... |