Skip to content
Snippets Groups Projects
Commit 415bade3 authored by Kevin Lyda's avatar Kevin Lyda
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.
parent a96e0ec5
No related branches found
No related tags found
1 merge request!3243Result of misspellings run.
Showing
with 27 additions and 27 deletions
Loading
Loading
@@ -327,7 +327,7 @@ var NoteList = {
 
 
/**
* Gets an inital set of notes.
* Gets an initial set of notes.
*/
getContent: function() {
$.ajax({
Loading
Loading
Loading
Loading
@@ -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;
 
Loading
Loading
Loading
Loading
@@ -128,10 +128,10 @@ class MergeRequestsController < ProjectResourceController
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
Loading
Loading
Loading
Loading
@@ -4,7 +4,7 @@ class Projects::TeamsController < Projects::ApplicationController
@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
 
Loading
Loading
Loading
Loading
@@ -47,7 +47,7 @@ class GollumWiki
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)
Loading
Loading
Loading
Loading
@@ -138,7 +138,7 @@ class Note < ActiveRecord::Base
super
end
# Temp fix to prevent app crash
# if note commit id doesnt exist
# if note commit id doesn't exist
rescue
nil
end
Loading
Loading
Loading
Loading
@@ -97,7 +97,7 @@ class GitPushService
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|
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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!
 
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
@@ -62,7 +62,7 @@ module Gitlab
# 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
Loading
Loading
Loading
Loading
@@ -13,7 +13,7 @@ module Gitlab
# 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)
Loading
Loading
Loading
Loading
@@ -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)
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -300,7 +300,7 @@ describe Gitlab::API do
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
Loading
Loading
Loading
Loading
@@ -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`.
*
Loading
Loading
@@ -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) {
Loading
Loading
@@ -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);
Loading
Loading
@@ -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
Loading
Loading
@@ -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;
Loading
Loading
@@ -15878,4 +15878,4 @@ ace.define("text!ace/theme/textmate.css", [], ".ace-tm .ace_editor {\n" +
ace[key] = a[key];
});
})();
\ No newline at end of file
Loading
Loading
@@ -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"),
{
Loading
Loading
Loading
Loading
@@ -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"),
{
Loading
Loading
Loading
Loading
@@ -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"),
{
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment