diff options
-rw-r--r-- | CHANGELOG | 4 | ||||
-rw-r--r-- | README.md | 23 | ||||
-rw-r--r-- | app/services/notification_service.rb | 24 | ||||
-rw-r--r-- | config/initializers/devise.rb | 4 | ||||
-rw-r--r-- | doc/api/projects.md | 2 | ||||
-rw-r--r-- | lib/gitlab/ldap/user.rb | 6 |
6 files changed, 27 insertions, 36 deletions
diff --git a/CHANGELOG b/CHANGELOG index acb37e80532..08a36e308bb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/README.md b/README.md index 5cc3081dcb9..a1fb8fc17c0 100644 --- a/README.md +++ b/README.md @@ -44,32 +44,24 @@ ** More details are in the [requirements doc](doc/install/requirements.md) -### Installation +### Official installation methods -#### Official production installation +* [Manual installation guide for a production server](doc/install/installation.md) -* [Installation guide for a production server](doc/install/installation.md) +* [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. +### Third party one-click installers -#### Official development installation +* [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. -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. +* [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.). -* [Vagrant virtual machine for development](https://github.com/gitlabhq/gitlab-vagrant-vm) - - -#### Unofficial production installations +#### Unofficial installation methods * [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. * [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. - -* [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. - -* [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. - - ### New versions and upgrading 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 * 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). - ### Run in production mode 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: diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index 750a71aea6b..eb42cac3f83 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -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) diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index dcf829c38e8..5da8932a651 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -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 diff --git a/doc/api/projects.md b/doc/api/projects.md index 5ec4c4a74e5..447c923b9b6 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -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" diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb index 3d57f3a2e35..59f0fa64a6a 100644 --- a/lib/gitlab/ldap/user.rb +++ b/lib/gitlab/ldap/user.rb @@ -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) |