Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'bai/syntax-error-fix' into test_bai

Conflicts:
	es/omegat-Benzirpi.tmx
	pt-br/07-customizing-git/01-chapter7.markdown
	ru/07-customizing-git/01-chapter7.markdown

Manually merged pull request #213
Added to the fix ko, nl, no-nb, fr, es, zh, ru, pt-br
  • Loading branch information...
commit 22e4de0e14a523a6f482589511cddc445ea69685 2 parents 3d2fe20 + a911247
@jnavila jnavila authored
View
4 ar/07-customizing-git/01-chapter7.markdown
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 ca/07-customizing-git/01-chapter7.markdown
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 cs/07-customizing-git/01-chapter7.markdown
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 de/07-customizing-git/01-chapter7.markdown
@@ -938,8 +938,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 en/07-customizing-git/01-chapter7.markdown
@@ -734,8 +734,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 es-ni/07-customizing-git/01-chapter7.markdown
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 es/07-customizing-git/01-chapter7.markdown
@@ -670,8 +670,8 @@ Utilizando la estructura ACL devuelta por el método 'get_acl_access_data' y com
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
8 es/omegat-Benzirpi.tmx
@@ -2059,8 +2059,8 @@ Figura 4-9.</seg>
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
@@ -2081,8 +2081,8 @@ Figura 4-9.</seg>
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 fr/07-customizing-git/01-chapter7.markdown
@@ -953,8 +953,8 @@ Chaque fichier des *commits* doit être vérifié par rapport à la structure AC
next if chemin.size == 0
acces_permis = false
acces[$utilisateur].each do |chemin_acces|
- if !chemin_acces # l'utilisateur a un accès complet
- || (chemin.index(chemin_acces) == 0) # acces à ce chemin
+ if !chemin_acces || # l'utilisateur a un accès complet
+ (chemin.index(chemin_acces) == 0) # acces à ce chemin
acces_permis = true
end
end
View
4 ja/07-customizing-git/01-chapter7.markdown
@@ -734,8 +734,8 @@ SHA-1 値がわかっているときにコミットからコミットメッセ
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 ko/07-customizing-git/01-chapter7.markdown
@@ -735,8 +735,8 @@ update 스크립트는 각 브랜치마다 한 번씩 실행된다는 것을 제
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 mk/07-customizing-git/01-chapter7.markdown
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 nl/07-customizing-git/01-chapter7.markdown
@@ -672,8 +672,8 @@ Als je gebruik maakt van de ACL struktuur die wordt teruggegeven door de `get_ac
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # gebruiker heeft overal toegang tot
- || (path.index(access_path) == 0) # toegang tot dit pad
+ if !access_path || # gebruiker heeft overal toegang tot
+ (path.index(access_path) == 0) # toegang tot dit pad
has_file_access = true
end
end
View
4 no-nb/07-customizing-git/01-chapter7.markdown
@@ -734,8 +734,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
5 pt-br/07-customizing-git/01-chapter7.markdown
@@ -720,6 +720,7 @@ Se você usar a estrutura ACL retornada pelo método `get_acl_access_data` e ver
def check_directory_perms
access = get_acl_access_data('acl')
+
# see if anyone is trying to push something they can't
new_commits = `git rev-list #{$oldrev}..#{$newrev}`.split("\n")
new_commits.each do |rev|
@@ -728,8 +729,8 @@ Se você usar a estrutura ACL retornada pelo método `get_acl_access_data` e ver
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 ru/07-customizing-git/01-chapter7.markdown
@@ -734,8 +734,8 @@ Insert 18333fig0703.png
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # пользователь имеет полный доступ
- || (path.index(access_path) == 0) # доступ к этому пути
+ if !access_path || # пользователь имеет полный доступ
+ (path.index(access_path) == 0) # доступ к этому пути
has_file_access = true
end
end
View
4 th/07-customizing-git/01-chapter7.markdown
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 tr/07-customizing-git/01-chapter7.markdown
@@ -734,8 +734,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 zh-tw/07-customizing-git/01-chapter7.markdown
@@ -677,8 +677,8 @@ A simple way to get the commit message from a commit when you have the SHA-1 val
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # user has access to everything
- || (path.index(access_path) == 0) # access to this path
+ if !access_path || # user has access to everything
+ (path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
View
4 zh/07-customizing-git/01-chapter7.markdown
@@ -672,8 +672,8 @@ update 脚本和 `pre-receive` 脚本十分类似。不同之处在于它会为
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
- if !access_path # 用户拥有完全访问权限
- || (path.index(access_path) == 0) # 或者对此位置有访问权限
+ if !access_path || # 用户拥有完全访问权限
+ (path.index(access_path) == 0) # 或者对此位置有访问权限
has_file_access = true
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.