Merge branch 'master' into issue-4173-alternative-fix

zeripath · zeripath · commit 0fc334a9d68f · 2019-02-09T15:34:39.000Z
diff --git a/models/repo.go b/models/repo.go
@@ -1379,7 +1379,7 @@ func CreateRepository(doer, u *User, opts CreateRepoOptions) (_ *Repository, err
 		LowerName:     strings.ToLower(opts.Name),
 		Description:   opts.Description,
 		IsPrivate:     opts.IsPrivate,
-		IsFsckEnabled: true,
+		IsFsckEnabled: !opts.IsMirror,
 	}
 
 	sess := x.NewSession()
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
@@ -367,7 +367,7 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error
 // swagger:model MergePullRequestOption
 type MergePullRequestForm struct {
 	// required: true
-	// enum: merge, rebase, rebase-merge, squash
+	// enum: merge,rebase,rebase-merge,squash
 	Do                string `binding:"Required;In(merge,rebase,rebase-merge,squash)"`
 	MergeTitleField   string
 	MergeMessageField string
diff --git a/public/css/index.css b/public/css/index.css
diff --git a/public/less/_base.less b/public/less/_base.less
@@ -75,7 +75,7 @@ pre > code {
 }
 .full.height {
     padding: 0;
-    margin: 0 0 -@footer-margin 0;
+    margin: 0 0 calc(-@footer-margin - 2px) 0;
     min-height: 100%;
 }
 .following.bar {
@@ -126,9 +126,10 @@ pre > code {
     }
     #navbar {
         width: 100vw;
+        padding: 0 .5rem;
     }
     #navbar .brand {
-        margin: 0 0 0 .5rem;
+        margin: 0;
     }
     @media only screen and (max-width: 767px) {
         #navbar:not(.shown) > *:not(:first-child) {
@@ -470,6 +471,8 @@ footer {
     width: 100%;
     color: #888888;
     .container {
+        width: 100vw !important;
+        padding: 0 .5rem;
         .fa {
             width: 16px;
             text-align: center;
diff --git a/public/less/_dashboard.less b/public/less/_dashboard.less
@@ -61,6 +61,11 @@
     .dashboard-repos {
         margin: 0 1px;
     }
+
+    .dashboard-navbar {
+        width: 100vw;
+        padding: 0 .5rem;
+    }
 }
 
 &.feeds {
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
@@ -7718,9 +7718,9 @@
           "type": "string",
           "enum": [
             "merge",
-            " rebase",
-            " rebase-merge",
-            " squash"
+            "rebase",
+            "rebase-merge",
+            "squash"
           ]
         },
         "MergeMessageField": {
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
@@ -1,4 +1,4 @@
-<div class="ui container">
+<div class="dashboard-navbar">
 	<div class="ui secondary stackable menu">
 		<div class="item">
 			<div class="ui floating dropdown link jump">

Original file line number	Diff line number	Diff line change
`@@ -1379,7 +1379,7 @@ func CreateRepository(doer, u User, opts CreateRepoOptions) (_ Repository, err`
`1379`	`1379`	`LowerName: strings.ToLower(opts.Name),`
`1380`	`1380`	`Description: opts.Description,`
`1381`	`1381`	`IsPrivate: opts.IsPrivate,`
`1382`		`- IsFsckEnabled: true,`
	`1382`	`+ IsFsckEnabled: !opts.IsMirror,`
`1383`	`1383`	`}`
`1384`	`1384`
`1385`	`1385`	`sess := x.NewSession()`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ pre > code {`
`75`	`75`	`}`
`76`	`76`	`.full.height {`
`77`	`77`	`padding: 0;`
`78`		`- margin: 0 0 -@footer-margin 0;`
	`78`	`+ margin: 0 0 calc(-@footer-margin - 2px) 0;`
`79`	`79`	`min-height: 100%;`
`80`	`80`	`}`
`81`	`81`	`.following.bar {`
`@@ -126,9 +126,10 @@ pre > code {`
`126`	`126`	`}`
`127`	`127`	`#navbar {`
`128`	`128`	`width: 100vw;`
	`129`	`+ padding: 0 .5rem;`
`129`	`130`	`}`
`130`	`131`	`#navbar .brand {`
`131`		`- margin: 0 0 0 .5rem;`
	`132`	`+ margin: 0;`
`132`	`133`	`}`
`133`	`134`	`@media only screen and (max-width: 767px) {`
`134`	`135`	`#navbar:not(.shown) > *:not(:first-child) {`
`@@ -470,6 +471,8 @@ footer {`
`470`	`471`	`width: 100%;`
`471`	`472`	`color: #888888;`
`472`	`473`	`.container {`
	`474`	`+ width: 100vw !important;`
	`475`	`+ padding: 0 .5rem;`
`473`	`476`	`.fa {`
`474`	`477`	`width: 16px;`
`475`	`478`	`text-align: center;`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,11 @@`
`61`	`61`	`.dashboard-repos {`
`62`	`62`	`margin: 0 1px;`
`63`	`63`	`}`
	`64`	`+`
	`65`	`+ .dashboard-navbar {`
	`66`	`+ width: 100vw;`
	`67`	`+ padding: 0 .5rem;`
	`68`	`+ }`
`64`	`69`	`}`
`65`	`70`
`66`	`71`	`&.feeds {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div class="ui container">`
	`1`	`+<div class="dashboard-navbar">`
`2`	`2`	`<div class="ui secondary stackable menu">`
`3`	`3`	`<div class="item">`
`4`	`4`	`<div class="ui floating dropdown link jump">`