diff --git a/CHANGELOG b/CHANGELOG index ee2167fb9623c00f639ac53a493fd422ef7eea12..cc707617923c52d16b97eb9d8b285ac4f5489eb1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ v 6.0.0 - cache project graph - Drop support of root namespaces - Redesign project settings navigation - - Restlyed login screen + - Restyled login screen - Default theme is classic now - Cache result of methods like authorize_projects, project.team.members etc - Remove $.ready events @@ -48,7 +48,7 @@ v 5.3.0 - Api: added teams api - Api: Prevent blob content being escaped - Api: Smart deploy key add behaviour - - Api: projets/owned.json return user owned project + - Api: projects/owned.json return user owned project - Fix bug with team assignation on project from #4109 - Advanced snippets: public/private, project/personal (Andrew Kulakov) - Repository Graphs (Karlo Nicholas T. Soriano) @@ -84,7 +84,7 @@ v 5.2.0 v 5.1.0 - You can login with email or username now - Corrected project transfer rollback when repository cannot be moved - - Move both repo and wiki when project transfer requrested + - Move both repo and wiki when project transfer requested - Admin area: project editing was removed from admin namespace - Access: admin user has now access to any project. - Notification settings @@ -94,7 +94,7 @@ v 5.1.0 - Restyled Issues list. Show milestone version in issue row - Restyled Merge Request list - Backup now dump/restore uploads - - Improved perfomance of dashboard (Andrew Kumanyaev) + - Improved performance of dashboard (Andrew Kumanyaev) - File history now tracks renames (Akzhan Abdulin) - Drop wiki migration tools - Drop sqlite migration tools @@ -103,7 +103,7 @@ v 5.1.0 - Restyled network graph (Hiroyuki Sato) v 5.0.1 - - Fixed issue with gitlab-grit being overrided by grit + - Fixed issue with gitlab-grit being overridden by grit v 5.0.0 - Replaced gitolite with gitlab-shell @@ -123,7 +123,7 @@ v 5.0.0 - Update capybara, rspec-rails, poltergeist to recent versions - Wiki on git using Gollum - Added Solarized Dark theme for code review - - Dont show user emails in autocomplete lists, profile pages + - Don't show user emails in autocomplete lists, profile pages - Added settings tab for group, team, project - Replace user popup with icons in header - Handle project moving with gitlab-shell @@ -176,7 +176,7 @@ v 4.1.0 v 4.0.0 - Remove project code and path from API. Use id instead - - Return valid clonable url to repo for web hook + - Return valid cloneable url to repo for web hook - Fixed backup issue - Reorganized settings - Fixed commits compare @@ -241,15 +241,15 @@ v 3.0.0 - Web Editor - Fixed bug with gitolite keys - UI improved - - Increased perfomance of application + - Increased performance of application - Show user avatar in last commit when browsing Files - Refactored Gitlab::Merge - - Use Font Awsome for icons - - Separate observing of Note and MergeRequestsa + - Use Font Awesome for icons + - Separate observing of Note and MergeRequests - Milestone "All Issues" filter - Fix issue close and reopen button text and styles - Fix forward/back while browsing Tree hierarchy - - Show numer of notes for commits and merge requests + - Show number of notes for commits and merge requests - Added support pg from box and update installation doc - Reject ssh keys that break gitolite - [API] list one project hook @@ -268,7 +268,7 @@ v 2.9.0 - added factory_girl - restyled projects list on dashboard - ssh keys validation to prevent gitolite crash - - send notifications if changed premission in project + - send notifications if changed permission in project - scss refactoring. gitlab_bootstrap/ dir - fix git push http body bigger than 112k problem - list of labels page under issues tab @@ -302,7 +302,7 @@ v 2.7.0 - System hooks - UI improved - Dashboard events endless scroll - - Source perfomance increased + - Source performance increased v 2.6.0 - UI polished @@ -310,7 +310,7 @@ v 2.6.0 - Handle huge commits - Last Push widget - Bugfix - - Better perfomance + - Better performance - Email in resque - Increased test coverage - Ability to remove branch with MR accept @@ -331,7 +331,7 @@ v 2.4.0 - Bootstrap 2.0 - Responsive layout - Big commits handling - - Perfomance improved + - Performance improved - Milestones v 2.3.1 @@ -411,11 +411,11 @@ v 1.0.2 - added adv validation for project path & code - feature: issues can be sortable - bugfix - - username dispalyed on top panel + - username displayed on top panel v 1.0.1 - fixed: with invalid source code for commit - - fixed: lose branch/tag selection when use tree navigateion + - fixed: lose branch/tag selection when use tree navigation - when history clicked - display path - bug fix & code cleaning @@ -432,11 +432,11 @@ v 0.9.4 - authorization improved - html escaping - bug fix - - increassed test coverage + - increased test coverage - design improvements v 0.9.1 - - increassed test coverage + - increased test coverage - design improvements - new issue email notification - updated app name @@ -444,7 +444,7 @@ v 0.9.1 - issue can be edit v 0.8.0 - - sytax highlight for main file types + - syntax highlight for main file types - redesign - stability - security fixes diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 6dfe722a5e83cf70ecb676d4eed0812b16806eda..5e1e4dc4113e02f765df278a01119fc6aba6e20e 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -177,7 +177,7 @@ var NoteList = { var form = $(this).closest("form"); var row = form.closest("tr"); - // show the reply button (will only work for replys) + // show the reply button (will only work for replies) form.prev(".js-discussion-reply-button").show(); if (row.is(".js-temp-notes-holder")) { diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 62b9fe08091fcf4d3676e27d42c653e34c76e13c..7703ae8b249500ca7e6b6995f3afbec45a6478d6 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -24,7 +24,7 @@ class Admin::UsersController < Admin::ApplicationController if user.block redirect_to :back, alert: "Successfully blocked" else - redirect_to :back, alert: "Error occured. User was not blocked" + redirect_to :back, alert: "Error occurred. User was not blocked" end end @@ -32,7 +32,7 @@ class Admin::UsersController < Admin::ApplicationController if user.activate redirect_to :back, alert: "Successfully unblocked" else - redirect_to :back, alert: "Error occured. User was not unblocked" + redirect_to :back, alert: "Error occurred. User was not unblocked" end end diff --git a/app/controllers/projects/team_members_controller.rb b/app/controllers/projects/team_members_controller.rb index 07ad7d861530d86892dcecf3a7ff0a62045964f5..6fee770cae2f510bbe57ddf7081efa055762a6a5 100644 --- a/app/controllers/projects/team_members_controller.rb +++ b/app/controllers/projects/team_members_controller.rb @@ -49,7 +49,7 @@ class Projects::TeamMembersController < Projects::ApplicationController def apply_import giver = Project.find(params[:source_project_id]) status = @project.team.import(giver) - notice = status ? "Succesfully imported" : "Import failed" + notice = status ? "Successfully imported" : "Import failed" redirect_to project_team_index_path(project), notice: notice end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9b10d90fecb5e89b091cdf6f4093646208f0ff05..e752e9fe65e3238884793f0160ac1450841ab49d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -35,7 +35,7 @@ module ApplicationHelper args.any? { |v| v.to_s.downcase == controller.controller_name } end - # Check if a partcular action is the current one + # Check if a particular action is the current one # # args - One or more action names to check # diff --git a/app/models/namespace.rb b/app/models/namespace.rb index c74e0cf5a1da4ed859e83ecc09fd0013502d3be0..189591669312fe7148e85cac2fdec018a6fb1f0c 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -73,7 +73,7 @@ class Namespace < ActiveRecord::Base gitlab_shell.rm_satellites(path_was) send_update_instructions rescue - # Returning false does not rolback after_* transaction but gives + # Returning false does not rollback after_* transaction but gives # us information about failing some of tasks false end diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb index da815a859242c94f325e36efd282a4f2ab7da212..1d21e96369a41452132b9df21679570a92cca586 100644 --- a/app/models/network/graph.rb +++ b/app/models/network/graph.rb @@ -43,9 +43,9 @@ module Network # Method is adding time and space on the # list of commits. As well as returns date list - # corelated with time set on commits. + # correlated with time set on commits. # - # @return [Array] list of commit dates corelated with time on commits + # @return [Array] list of commit dates correlated with time on commits def index_commits days = [] @map = {} diff --git a/app/models/project.rb b/app/models/project.rb index 8297c11ba8a81f2d4853086217807f32bd69c2d4..497ed1a218cc1b4cddcb3e45d729261991f96d49 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -432,7 +432,7 @@ class Project < ActiveRecord::Base gitlab_shell.rm_satellites(old_path_with_namespace) send_move_instructions rescue - # Returning false does not rolback after_* transaction but gives + # Returning false does not rollback after_* transaction but gives # us information about failing some of tasks false end diff --git a/app/models/user.rb b/app/models/user.rb index 193349c95fcf3e1400beec402e1e12c2484ae55c..a149b3a0322785d2e0a4c67f5b5b6416ffeb233b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -155,7 +155,7 @@ class User < ActiveRecord::Base # Class methods # class << self - # Devise method overriden to allow sing in with email or username + # Devise method overridden to allow sing in with email or username def find_for_database_authentication(warden_conditions) conditions = warden_conditions.dup if login = conditions.delete(:login) diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 497d69e8e90bab7b1b3a2721454144541ff026f6..b7629b9f24c7c30693f15a4efb2478bbdbcc0563 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -143,7 +143,7 @@ class WikiPage save :update_page, @page, content, format, message end - # Destroys the WIki Page. + # Destroys the Wiki Page. # # Returns boolean True or False. def delete diff --git a/app/observers/activity_observer.rb b/app/observers/activity_observer.rb index ee3e4629b4cb259c4867b1ac8753c5db683527f5..4f4eb36a188f202e92adaeb516c86150bf7eec86 100644 --- a/app/observers/activity_observer.rb +++ b/app/observers/activity_observer.rb @@ -8,7 +8,7 @@ class ActivityObserver < BaseObserver # Skip system status notes like 'status changed to close' return true if record.note.include?("_Status changed to ") - # Skip wall notes to prevent spaming of dashboard + # Skip wall notes to prevent spamming of dashboard return true if record.noteable_type.blank? end diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index f3dc552a8e7a3cc8c71b926b6262ca6a2c2b27b8..b5cf5cedd6b62f45c577e58f8ac59116de194aa0 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -1,6 +1,6 @@ # NotificationService class # -# Used for notifing users with emails about different events +# Used for notifying users with emails about different events # # Ex. # NotificationService.new.new_issue(issue, current_user) @@ -90,7 +90,7 @@ class NotificationService # Notify new user with email after creation def new_user(user) - # Dont email omniauth created users + # Don't email omniauth created users mailer.new_user_email(user.id, user.password) unless user.extern_uid? end diff --git a/app/views/help/public_access.html.haml b/app/views/help/public_access.html.haml index 94aaeff88d7e202cf235fb1abff25152157a50c1..c67402ee319610a1cc54f13fbe474ca1275037d0 100644 --- a/app/views/help/public_access.html.haml +++ b/app/views/help/public_access.html.haml @@ -3,7 +3,7 @@ %p GitLab allows you to open selected projects to be accessed publicly. - These projects will be clonable + These projects will be cloneable %em without any authentication. Also they will be listed on the #{link_to "public access directory", public_root_path}. diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index 5e6b5b71753874f37a0a6a30ad812db2a89724a8..f2e65f68da60bbd19bb527999f78a8fa6fbae3d2 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -9,7 +9,7 @@ .alert.alert-block %p %strong Warning! This comparison include 100+ commits. - %p To prevent performance issue we dont show diff information. + %p To prevent performance issue we don't show diff information. - if @commits.present? %div.ui-box diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index ba389018d59c12cb0cecb515afcd996e651de244..31343f5eb728c06cd4366afb1967431f2dc1190b 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -28,7 +28,7 @@ .input = f.text_field :import_url, class: 'xlarge', placeholder: 'https://github.com/randx/six.git' .light - URL must be clonable + URL must be cloneable %p.padded New projects are private by default. You choose who can see the project and commit to repository. diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml index 66f28b8b804dd13dade996eabb913be5844a61e6..c52fbcb58f68df1f427c3405a3ea70be74561866 100644 --- a/app/views/projects/wikis/_new.html.haml +++ b/app/views/projects/wikis/_new.html.haml @@ -7,6 +7,6 @@ %span Page slug = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'input-xlarge', required: true, :'data-wikis-path' => project_wikis_path(@project) %p.hint - Please dont use spaces and slashes + Please don't use spaces and slashes .modal-footer = link_to 'Build', '#', class: 'build-new-wiki btn btn-create' diff --git a/doc/api/issues.md b/doc/api/issues.md index 8754759358631d7bcf2c4b9f36a41bdfe0c7bb6c..723c8acf381604c104b1465c00c7099de04584ed 100644 --- a/doc/api/issues.md +++ b/doc/api/issues.md @@ -1,6 +1,6 @@ ## List issues -Get all issues created by authenticed user. This function takes pagination parameters +Get all issues created by authenticated user. This function takes pagination parameters `page` and `per_page` to restrict the list of issues. ``` diff --git a/doc/api/projects.md b/doc/api/projects.md index 2fc235066df309184b7cf7a3ab1963ef9a0702f8..9afffcbaa80685f86ac2ae9400a454b12b5e3d0b 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -193,7 +193,7 @@ Parameters: **Project access levels** -The project access levels are defined in the `user_project.rb` class. Currently, these levels are recoginized: +The project access levels are defined in the `user_project.rb` class. Currently, these levels are recognized: ``` GUEST = 10 diff --git a/doc/api/users.md b/doc/api/users.md index 9dd35f4bca039a14322e21ca7cc7ccfcdb4f4b15..20664f1e7407d978ff08ced800f17cb746df67b9 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -123,7 +123,7 @@ Parameters: + `bio` - User's bio Note, at the moment this method does only return a 404 error, even in cases where a 409 (Conflict) would -be more appropriate, e.g. when renaming the email address to some exsisting one. +be more appropriate, e.g. when renaming the email address to some existing one. ## User deletion diff --git a/doc/make_release.md b/doc/make_release.md index 24f8397f10b77916c2399ba8d46a1c4bcf58cd29..c93785e8750783c6f227690251abc4beae0b284b 100644 --- a/doc/make_release.md +++ b/doc/make_release.md @@ -8,7 +8,7 @@ NOTE: This is a developer guide. If you are trying to install GitLab see the lat ### From x.x to x.x -#### 0. Any major changes? Database updates? Web server change? File strucuture changes? +#### 0. Any major changes? Database updates? Web server change? File structure changes? #### 1. Make backup diff --git a/doc/update/4.0-to-4.1.md b/doc/update/4.0-to-4.1.md index aa8a305a7ce8f2d4255d934522978a7335db2850..324af7597b24c300b034112b4fb11f27c45faac2 100644 --- a/doc/update/4.0-to-4.1.md +++ b/doc/update/4.0-to-4.1.md @@ -37,7 +37,7 @@ sudo -u gitlab -H bundle exec rake db:migrate RAILS_ENV=production # backup old one sudo mv /etc/init.d/gitlab /etc/init.d/gitlab.old -# get new one usign sidekiq +# get new one using sidekiq sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/4-1-stable/init.d/gitlab sudo chmod +x /etc/init.d/gitlab diff --git a/doc/update/4.2-to-5.0.md b/doc/update/4.2-to-5.0.md index 60d37931ec9e3bf900d9508b481f6e442a96be72..053a50ebc88405008e2e78fe8a2794355daebbae 100644 --- a/doc/update/4.2-to-5.0.md +++ b/doc/update/4.2-to-5.0.md @@ -2,7 +2,7 @@ ## Important changes -* We dont use `gitlab` user any more. Everything will be moved to `git` user +* We don't use `gitlab` user any more. Everything will be moved to `git` user * __requires ruby1.9.3__ @@ -126,7 +126,7 @@ sudo service nginx restart ``` -__7. Start gitlab instace__ +__7. Start gitlab instance__ ``` diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb index d0b89f85adee079f23af8fe6af2ebec4856c1ffd..c819ce56ac91319c6cb745a66f108ed3619781fe 100644 --- a/lib/gitlab/backend/shell.rb +++ b/lib/gitlab/backend/shell.rb @@ -142,7 +142,7 @@ module Gitlab # Remove all ssh keys from gitlab shell # # Ex. - # remmove_all_keys + # remove_all_keys # def remove_all_keys system "#{gitlab_shell_user_home}/gitlab-shell/bin/gitlab-keys", "clear" diff --git a/lib/gitlab/backend/shell_env.rb b/lib/gitlab/backend/shell_env.rb index 157218750938d341d1b644def73bea38c4b099a2..044afb27f3fad36c760e8ba0dabd96a53db11809 100644 --- a/lib/gitlab/backend/shell_env.rb +++ b/lib/gitlab/backend/shell_env.rb @@ -1,6 +1,6 @@ module Gitlab # This module provide 2 methods - # to set specific ENV variabled for GitLab Shell + # to set specific ENV variables for GitLab Shell module ShellEnv extend self diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index 4c7be04246cb3e53532e2fa732f8c73ff8277d95..69f8551661b5aa8141bf40373fb0830c6076d846 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -116,7 +116,7 @@ module Gitlab repo.git.fetch({timeout: true}, :origin) end - # Create directory for stroing + # Create directory for storing # satellites lock files def create_locks_dir FileUtils.mkdir_p(lock_files_dir) diff --git a/lib/tasks/gitlab/cleanup.rake b/lib/tasks/gitlab/cleanup.rake index 186abc65563081a264376012080a5460ce87fadd..4aaab11340f1d92456cc005d0179d07745f09fa9 100644 --- a/lib/tasks/gitlab/cleanup.rake +++ b/lib/tasks/gitlab/cleanup.rake @@ -43,7 +43,7 @@ namespace :gitlab do end end - desc "GITLAB | Cleanup | Clean respositories" + desc "GITLAB | Cleanup | Clean repositories" task repos: :environment do warn_user_is_not_gitlab remove_flag = ENV['REMOVE'] diff --git a/lib/tasks/gitlab/enable_namespaces.rake b/lib/tasks/gitlab/enable_namespaces.rake index 6b7b75fd1b6fbc44199dad4ae30971dee89caa7a..927748c0fd5f8e0d43bd4abf599e7f3de47c3a83 100644 --- a/lib/tasks/gitlab/enable_namespaces.rake +++ b/lib/tasks/gitlab/enable_namespaces.rake @@ -42,7 +42,7 @@ namespace :gitlab do username = user.email.match(/^[^@]*/)[0] username.gsub!("+", ".") - # return username if no mathes + # return username if no matches return username unless User.find_by_username(username) # look for same username diff --git a/lib/tasks/gitlab/task_helpers.rake b/lib/tasks/gitlab/task_helpers.rake index 34a4a322c111db75ed4ddb9b95cc1456ea438807..f84257d15b5265500c9345744bae1902bc5f8253 100644 --- a/lib/tasks/gitlab/task_helpers.rake +++ b/lib/tasks/gitlab/task_helpers.rake @@ -55,7 +55,7 @@ namespace :gitlab do # Runs the given command and matches the output against the given pattern # # Returns nil if nothing matched - # Retunrs the MatchData if the pattern matched + # Returns the MatchData if the pattern matched # # see also #run # see also String#match diff --git a/lib/tasks/migrate/migrate_groups.rake b/lib/tasks/migrate/migrate_groups.rake index 153172dc90a73e8de761ec81e7dbe552430e7c65..49c930a489394015dbfc2b7371363feb4001d488 100644 --- a/lib/tasks/migrate/migrate_groups.rake +++ b/lib/tasks/migrate/migrate_groups.rake @@ -1,4 +1,4 @@ -desc "GITLAB | Migrate Gropus to match v6.0" +desc "GITLAB | Migrate Groups to match v6.0" task migrate_groups: :environment do puts "This will add group owners to group membership" ask_to_continue diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index 0f206f472346a17b039f831f48868e84727b9126..a52606bb536e28fa381f1b6664da280c52fafa4f 100644 --- a/spec/helpers/gitlab_markdown_helper_spec.rb +++ b/spec/helpers/gitlab_markdown_helper_spec.rb @@ -287,7 +287,7 @@ describe GitlabMarkdownHelper do gfm(":invalid-emoji:").should_not match(/