Commit cd19f82e authored by Johannes Schleifenbaum's avatar Johannes Schleifenbaum
Browse files

Fix typos

parent acc769d29c1b
......@@ -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
......
......@@ -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")) {
......
......@@ -24,7 +24,7 @@ def block
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 @@ def unblock
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
......
......@@ -49,7 +49,7 @@ def destroy
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
......
......@@ -35,7 +35,7 @@ def current_controller?(*args)
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
#
......
......@@ -73,7 +73,7 @@ def move_dir
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
......
......@@ -43,9 +43,9 @@ def collect_commits
# 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<TimeDate>] list of commit dates corelated with time on commits
# @return [Array<TimeDate>] list of commit dates correlated with time on commits
def index_commits
days = []
@map = {}
......
......@@ -432,7 +432,7 @@ def rename_repo
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
......
......@@ -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)
......
......@@ -143,7 +143,7 @@ def update(new_content = "", format = :markdown, message = nil)
save :update_page, @page, content, format, message
end
# Destroys the WIki Page.
# Destroys the Wiki Page.
#
# Returns boolean True or False.
def delete
......
......@@ -8,7 +8,7 @@ def after_create(record)
# 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
......
# 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 @@ def merge_mr(merge_request)
# 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
......
......@@ -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}.
......
......@@ -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
......
......@@ -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.
......
......@@ -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'
## 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.
```
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment