diff options
5 files changed, 5 insertions, 5 deletions
diff --git a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java index d6425d0d73e..19f2a67693d 100644 --- a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java +++ b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java @@ -132,7 +132,7 @@ public class GitHubSettings { .build(), PropertyDefinition.builder(GROUPS_SYNC) .name("Synchronize teams as groups") - .description("For each team he belongs to, the user will be associated to a group named 'Organisation/Team' (if it exists) in SonarQube.") + .description("For each team they belong to, the user will be associated to a group named 'Organisation/Team' (if it exists) in SonarQube.") .category(CATEGORY) .subCategory(SUBCATEGORY) .type(BOOLEAN) diff --git a/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java b/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java index 9a9cec5cb95..69fdb4aa868 100644 --- a/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java +++ b/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java @@ -122,7 +122,7 @@ public class GitLabSettings { PropertyDefinition.builder(GITLAB_AUTH_SYNC_USER_GROUPS) .deprecatedKey("sonar.auth.gitlab.sync_user_groups") .name("Synchronize user groups") - .description("For each GitLab group he belongs to, the user will be associated to a group with the same name (if it exists) in SonarQube." + + .description("For each GitLab group they belong to, the user will be associated to a group with the same name (if it exists) in SonarQube." + " If enabled, the GitLab Oauth2 application will need to provide the api scope") .category(CATEGORY) .subCategory(SUBCATEGORY) diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx index 4c4cd01d70e..dee0996689c 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx @@ -150,7 +150,7 @@ export class App extends React.PureComponent<Props, State> { (prevState.selected !== this.state.selected || prevState.openRule) ) { // if user simply selected another issue - // or if he went from the source code back to the list of issues + // or if user went from the source code back to the list of issues this.scrollToSelectedRule(); } } diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChange.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChange.tsx index a9bd55566d3..b367362dfa2 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChange.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChange.tsx @@ -75,7 +75,7 @@ export default class BulkChange extends React.PureComponent<Props, State> { }; render() { - // show "Bulk Change" button only if user has at least one QP which he administrates + // show "Bulk Change" button only if user is admin of at least one QP const canBulkChange = Object.values(this.props.referencedProfiles).some(profile => Boolean(profile.actions && profile.actions.edit) ); diff --git a/server/sonar-web/src/main/js/apps/issues/components/App.tsx b/server/sonar-web/src/main/js/apps/issues/components/App.tsx index 0c92c8f0eff..d9ac7cbfd00 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/App.tsx @@ -219,7 +219,7 @@ export default class App extends React.PureComponent<Props, State> { (prevState.selected !== this.state.selected || prevState.openIssue) ) { // if user simply selected another issue - // or if he went from the source code back to the list of issues + // or if user went from the source code back to the list of issues this.scrollToSelectedIssue(); } } |