Permalink
Browse files

Result of misspellings run.

Most of these are comments but a few are strings for users.

Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check

It runs mostly clean now.
  • Loading branch information...
1 parent a96e0ec commit 415bade302d6c3eef5810c7b812a8f608ef43001 @lyda lyda committed Mar 17, 2013
Showing with 43 additions and 43 deletions.
  1. +1 −1 app/assets/javascripts/notes.js
  2. +1 −1 app/assets/stylesheets/sections/notes.scss
  3. +2 −2 app/controllers/merge_requests_controller.rb
  4. +1 −1 app/controllers/projects/teams_controller.rb
  5. +1 −1 app/models/gollum_wiki.rb
  6. +1 −1 app/models/note.rb
  7. +1 −1 app/services/git_push_service.rb
  8. +1 −1 app/views/admin/logs/show.html.haml
  9. +1 −1 config/unicorn.rb.example
  10. +1 −1 doc/api/users.md
  11. +1 −1 features/steps/userteams/userteams.rb
  12. +1 −1 features/teams/team.feature
  13. +1 −1 lib/api/users.rb
  14. +1 −1 lib/gitlab/satellite/edit_file_action.rb
  15. +2 −2 lib/tasks/gitlab/task_helpers.rake
  16. +1 −1 spec/requests/api/users_spec.rb
  17. +6 −6 vendor/assets/javascripts/ace-src-noconflict/ace.js
  18. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-coldfusion.js
  19. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-groovy.js
  20. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-html.js
  21. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-jade.js
  22. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-java.js
  23. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-javascript.js
  24. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-jsp.js
  25. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-liquid.js
  26. +2 −2 vendor/assets/javascripts/ace-src-noconflict/mode-luahtml.js
  27. +2 −2 vendor/assets/javascripts/ace-src-noconflict/mode-luapage.js
  28. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-markdown.js
  29. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-php.js
  30. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-scala.js
  31. +1 −1 vendor/assets/javascripts/ace-src-noconflict/mode-svg.js
  32. +2 −2 vendor/assets/javascripts/ace-src-noconflict/worker-javascript.js
  33. +1 −1 vendor/assets/javascripts/ace-src-noconflict/worker-xquery.js
@@ -327,7 +327,7 @@ var NoteList = {
/**
- * Gets an inital set of notes.
+ * Gets an initial set of notes.
*/
getContent: function() {
$.ajax({
@@ -192,7 +192,7 @@ ul.notes {
}
}
- // "show" the icon also if we just hover somwhere over the line
+ // "show" the icon also if we just hover somewhere over the line
&:hover > td {
background: $hover !important;
@@ -128,10 +128,10 @@ def module_enabled
end
def validates_merge_request
- # Show git not found page if target branch doesnt exist
+ # Show git not found page if target branch doesn't exist
return git_not_found! unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)
- # Show git not found page if source branch doesnt exist
+ # Show git not found page if source branch doesn't exist
# and there is no saved commits between source & target branch
return git_not_found! if !@project.repo.heads.map(&:name).include?(@merge_request.source_branch) && @merge_request.commits.blank?
end
@@ -4,7 +4,7 @@ def available
@teams = current_user.is_admin? ? UserTeam.scoped : current_user.user_teams
@teams = @teams.without_project(project)
unless @teams.any?
- redirect_to project_team_index_path(project), notice: "No avaliable teams for assigment."
+ redirect_to project_team_index_path(project), notice: "No available teams for assigment."
end
end
@@ -47,7 +47,7 @@ def pages
wiki.pages.map { |page| WikiPage.new(self, page, true) }
end
- # Returns the last 30 Commit objects accross the entire
+ # Returns the last 30 Commit objects across the entire
# repository.
def recent_history
Commit.fresh_commits(wiki.repo, 30)
View
@@ -138,7 +138,7 @@ def noteable
super
end
# Temp fix to prevent app crash
- # if note commit id doesnt exist
+ # if note commit id doesn't exist
rescue
nil
end
@@ -97,7 +97,7 @@ def post_receive_data(oldrev, newrev, ref)
total_commits_count: push_commits_count
}
- # For perfomance purposes maximum 20 latest commits
+ # For performance purposes maximum 20 latest commits
# will be passed as post receive hook data.
#
push_commits_limited.each do |commit|
@@ -8,7 +8,7 @@
%li
= link_to "sidekiq.log", "#sidekiq", 'data-toggle' => 'tab'
-%p.light To prevent perfomance issues admin logs output the last 2000 lines
+%p.light To prevent performance issues admin logs output the last 2000 lines
.tab-content
.tab-pane.active#githost
.file_holder#README
@@ -30,7 +30,7 @@ end
before_fork do |server, worker|
- # the following is highly recomended for Rails + "preload_app true"
+ # the following is highly recommended for Rails + "preload_app true"
# as there's no need for the master process to hold a connection
defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
View
@@ -116,7 +116,7 @@ Parameters:
+ `skype` - Skype ID
+ `linkedin` - Linkedin
+ `twitter` - Twitter account
-+ `projects_limit` - Limit projects wich user can create
++ `projects_limit` - Limit projects each user can create
+ `extern_uid` - External UID
+ `provider` - External provider name
+ `bio` - User's bio
@@ -210,7 +210,7 @@ class Userteams < Spinach::FeatureSteps
click_link "Assign Project"
end
- Then 'I should see form with my own project in avaliable projects list' do
+ Then 'I should see form with my own project in available projects list' do
projects_select = find("#project_ids")
projects_select.should have_content(@project.name)
end
@@ -60,6 +60,6 @@ Feature: UserTeams
And I have my own project without teams
And I visit my team page
When I click on link "Assign Project"
- Then I should see form with my own project in avaliable projects list
+ Then I should see form with my own project in available projects list
When I submit form with selected project and max access
Then I should see my own project in team projects list
View
@@ -62,7 +62,7 @@ class Users < Grape::API
# skype - Skype ID
# linkedin - Linkedin
# twitter - Twitter account
- # projects_limit - Limit projects wich user can create
+ # projects_limit - Limit projects each user can create
# extern_uid - External authentication provider UID
# provider - External provider
# bio - Bio
@@ -13,7 +13,7 @@ def initialize(user, project, ref, file_path)
# Updates the files content and creates a new commit for it
#
# Returns false if the ref has been updated while editing the file
- # Returns false if commiting the change fails
+ # Returns false if committing the change fails
# Returns false if pushing from the satellite to Gitolite failed or was rejected
# Returns true otherwise
def commit!(content, commit_message, last_commit)
@@ -38,7 +38,7 @@ namespace :gitlab do
# Prompt the user to input something
#
# message - the message to display before input
- # choices - array of strings of acceptible answers or nil for any answer
+ # choices - array of strings of acceptable answers or nil for any answer
#
# Returns the user's answer
def prompt(message, choices = nil)
@@ -49,7 +49,7 @@ namespace :gitlab do
answer
end
- # Runs the given command and matches the output agains the given pattern
+ # Runs the given command and matches the output against the given pattern
#
# Returns nil if nothing matched
# Retunrs the MatchData if the pattern matched
@@ -300,7 +300,7 @@
response.status.should == 200
end
- it "should return sucess if key ID not found" do
+ it "should return success if key ID not found" do
delete api("/user/keys/42", user)
response.status.should == 200
end
@@ -4800,7 +4800,7 @@ var SearchHighlight = require("./search_highlight").SearchHighlight;
/**
* new EditSession(text, mode)
* - text (Document | String): If `text` is a `Document`, it associates the `EditSession` with it. Otherwise, a new `Document` is created, with the initial text
- * - mode (TextMode): The inital language mode to use for the document
+ * - mode (TextMode): The initial language mode to use for the document
*
* Sets up a new `EditSession` and associates it with the given `Document` and `TextMode`.
*
@@ -10068,7 +10068,7 @@ ace.define('ace/token_iterator', ['require', 'exports', 'module' ], function(req
* - initialRow (Number): The row to start the tokenizing at
* - initialColumn (Number): The column to start the tokenizing at
*
- * Creates a new token iterator object. The inital token index is set to the provided row and column coordinates.
+ * Creates a new token iterator object. The initial token index is set to the provided row and column coordinates.
*
**/
var TokenIterator = function(session, initialRow, initialColumn) {
@@ -11946,7 +11946,7 @@ var VirtualRenderer = function(container, theme) {
this.$horizScroll = horizScroll;
if (horizScrollChanged) {
this.scroller.style.overflowX = horizScroll ? "scroll" : "hidden";
- // when we hide scrollbar scroll event isn't emited
+ // when we hide scrollbar scroll event isn't emitted
// leaving session with wrong scrollLeft value
if (!horizScroll)
this.session.setScrollLeft(0);
@@ -13029,7 +13029,7 @@ var Text = function(parentEl) {
var html = [];
// Get the tokens per line as there might be some lines in between
- // beeing folded.
+ // being folded.
this.$renderLine(html, row, false, row == foldStart ? foldLine : false);
// don't use setInnerHtml since we are working with an empty DIV
@@ -14529,7 +14529,7 @@ var Editor = require("./editor").Editor;
* - dir (Number): The direction of lines to select: -1 for up, 1 for down
* - skip (Boolean): If `true`, removes the active selection range
*
- * Finds the next occurence of text in an active selection and adds it to the selections.
+ * Finds the next occurrence of text in an active selection and adds it to the selections.
**/
this.selectMore = function(dir, skip) {
var session = this.session;
@@ -15878,4 +15878,4 @@ ace.define("text!ace/theme/textmate.css", [], ".ace-tm .ace_editor {\n" +
ace[key] = a[key];
});
})();
-
+
@@ -1170,7 +1170,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -337,7 +337,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -389,7 +389,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -659,7 +659,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -338,7 +338,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -342,7 +342,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -597,7 +597,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -641,7 +641,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -466,7 +466,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -2412,4 +2412,4 @@ oop.inherits(LuaHtmlHighlightRules, HtmlHighlightRules);
exports.LuaHtmlHighlightRules = LuaHtmlHighlightRules;
-});
+});
@@ -382,7 +382,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -2477,4 +2477,4 @@ oop.inherits(LuaPageHighlightRules, HtmlHighlightRules);
exports.LuaPageHighlightRules = LuaPageHighlightRules;
-});
+});
@@ -384,7 +384,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -1685,7 +1685,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -338,7 +338,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -1177,7 +1177,7 @@ var JavaScriptHighlightRules = function() {
}
],
// regular expressions are only allowed after certain tokens. This
- // makes sure we don't mix up regexps with the divison operator
+ // makes sure we don't mix up regexps with the division operator
"regex_allowed": [
DocCommentHighlightRules.getStartRule("doc-start"),
{
@@ -2912,7 +2912,7 @@ var JSHINT = (function () {
immed : true, // if immediate invocations must be wrapped in parens
iterator : true, // if the `__iterator__` property should be allowed
jquery : true, // if jQuery globals should be predefined
- lastsemic : true, // if semicolons may be ommitted for the trailing
+ lastsemic : true, // if semicolons may be omitted for the trailing
// statements inside of a one-line blocks.
latedef : true, // if the use before definition should not be tolerated
laxbreak : true, // if line breaks should not be checked
@@ -3674,7 +3674,7 @@ var JSHINT = (function () {
line += 1;
// If smarttabs option is used check for spaces followed by tabs only.
- // Otherwise check for any occurence of mixed tabs and spaces.
+ // Otherwise check for any occurrence of mixed tabs and spaces.
if (option.smarttabs)
at = s.search(/ \t/);
else
@@ -7609,7 +7609,7 @@ org.antlr.runtime.BaseRecognizer.prototype = {
*
* Until then I'll leave this unimplemented. If there is enough clamor
* it would be possible to keep track of the invocation stack using an
- * auxillary array, but that will definitely be a performance hit.
+ * auxiliary array, but that will definitely be a performance hit.
*/
getRuleInvocationStack: function(e, recognizerClassName)
{

0 comments on commit 415bade

Please sign in to comment.