Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
b2c6ba97
Commit
b2c6ba97
authored
Aug 16, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1230 from tsigo/hooray_apostrophes
Correct usage of "Can't"
parents
05da3801
66399d55
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
12 deletions
+11
-12
app/models/project.rb
app/models/project.rb
+2
-2
app/views/errors/access_denied.html.haml
app/views/errors/access_denied.html.haml
+1
-1
app/views/errors/encoding.html.haml
app/views/errors/encoding.html.haml
+1
-2
app/views/errors/git_not_found.html.haml
app/views/errors/git_not_found.html.haml
+2
-1
app/views/errors/gitolite.html.haml
app/views/errors/gitolite.html.haml
+1
-2
app/views/errors/not_found.html.haml
app/views/errors/not_found.html.haml
+1
-1
app/views/merge_requests/show/_mr_accept.html.haml
app/views/merge_requests/show/_mr_accept.html.haml
+1
-1
app/views/snippets/index.html.haml
app/views/snippets/index.html.haml
+1
-1
lib/gitlab/gitolite.rb
lib/gitlab/gitolite.rb
+1
-1
No files found.
app/models/project.rb
View file @
b2c6ba97
...
@@ -66,7 +66,7 @@ class Project < ActiveRecord::Base
...
@@ -66,7 +66,7 @@ class Project < ActiveRecord::Base
project
project
rescue
=>
ex
rescue
=>
ex
project
.
error_code
=
:db
project
.
error_code
=
:db
project
.
errors
.
add
(
:base
,
"Cant save project. Please try again later"
)
project
.
errors
.
add
(
:base
,
"Can
'
t save project. Please try again later"
)
project
project
end
end
...
@@ -112,7 +112,7 @@ class Project < ActiveRecord::Base
...
@@ -112,7 +112,7 @@ class Project < ActiveRecord::Base
errors
[
:base
]
<<
(
"Your own projects limit is
#{
owner
.
projects_limit
}
! Please contact administrator to increase it"
)
errors
[
:base
]
<<
(
"Your own projects limit is
#{
owner
.
projects_limit
}
! Please contact administrator to increase it"
)
end
end
rescue
rescue
errors
[
:base
]
<<
(
"Cant check your ability to create project"
)
errors
[
:base
]
<<
(
"Can
'
t check your ability to create project"
)
end
end
def
repo_name
def
repo_name
...
...
app/views/errors/access_denied.html.haml
View file @
b2c6ba97
%h1
Access Denied
%h1
Access Denied
%hr
%hr
%h2
You are not allowed to access this page
%h2
You are not allowed to access this page
.
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
class:
"vlink"
}
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
class:
"vlink"
}
app/views/errors/encoding.html.haml
View file @
b2c6ba97
...
@@ -2,5 +2,4 @@
...
@@ -2,5 +2,4 @@
%h3
Encoding Error
%h3
Encoding Error
%hr
%hr
%p
%p
Page cant be loaded cause of encoding error
Page can't be loaded because of an encoding error.
app/views/errors/git_not_found.html.haml
View file @
b2c6ba97
...
@@ -2,4 +2,5 @@
...
@@ -2,4 +2,5 @@
%hr
%hr
%h2
Git Resource Not found
%h2
Git Resource Not found
%p
%p
Application cant get access to some branch or commit in your repository. Maybe it was removed
Application can't get access to some branch or commit in your repository. It
may have been moved.
app/views/errors/gitolite.html.haml
View file @
b2c6ba97
%h1
Git Error
%h1
Git Error
%hr
%hr
%h2
Application cant get access to your gitolite system.
%h2
Gitlab was unable to access your Gitolite system.
.git_error_tips
.git_error_tips
%h4
Tips for Administrator:
%h4
Tips for Administrator:
...
...
app/views/errors/not_found.html.haml
View file @
b2c6ba97
%h1
404
%h1
404
%hr
%hr
%h2
R
esource you were looking for doesn't exist.
%h2
The r
esource you were looking for doesn't exist.
%p
You may have mistyped the address or the page may have moved.
%p
You may have mistyped the address or the page may have moved.
app/views/merge_requests/show/_mr_accept.html.haml
View file @
b2c6ba97
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
%span
%span
=
link_to
"Show how to merge"
,
"#"
,
class:
"how_to_merge_link btn small padded"
,
title:
"How To Merge"
=
link_to
"Show how to merge"
,
"#"
,
class:
"how_to_merge_link btn small padded"
,
title:
"How To Merge"
%strong
This request cant be merged with GitLab. You should do it manually
%strong
This request can
'
t be merged with GitLab. You should do it manually
.automerge_widget.unchecked
.automerge_widget.unchecked
.alert-message
.alert-message
...
...
app/views/snippets/index.html.haml
View file @
b2c6ba97
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
.alert-message.block-message
.alert-message.block-message
=
link_to
new_project_snippet_path
(
@project
),
class:
"btn small add_new right"
,
title:
"New Snippet"
do
=
link_to
new_project_snippet_path
(
@project
),
class:
"btn small add_new right"
,
title:
"New Snippet"
do
Add new snippet
Add new snippet
Share code pastes with others if it cant be in a git repository
Share code pastes with others if it can
'
t be in a git repository
%br
%br
To add new snippet - click on button.
To add new snippet - click on button.
...
...
lib/gitlab/gitolite.rb
View file @
b2c6ba97
...
@@ -137,7 +137,7 @@ module Gitlab
...
@@ -137,7 +137,7 @@ module Gitlab
owner_name
=
repo
.
permissions
[
0
][
"RW+"
][
""
][
0
]
owner_name
=
repo
.
permissions
[
0
][
"RW+"
][
""
][
0
]
raise
StandardError
if
owner_name
.
blank?
raise
StandardError
if
owner_name
.
blank?
rescue
=>
ex
rescue
=>
ex
puts
"Cant determine gitolite-admin owner"
.
red
puts
"Can
'
t determine gitolite-admin owner"
.
red
raise
StandardError
raise
StandardError
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment