Skip to content

fix: Accept web-command cli flags if web-command is commited #5200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 1, 2018
Merged

fix: Accept web-command cli flags if web-command is commited #5200

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
50fe8a1
fix: Accept web-command cli flags if web-command is commited
Oct 27, 2018
aa4c8d4
Merge branch 'master' into issue/#5065_no_ignore_flag_default_web
techknowlogick Oct 29, 2018
680616b
Removed style breaking newline
HoffmannP Oct 29, 2018
2eac8b8
Merge branch 'master' into issue/#5065_no_ignore_flag_default_web
techknowlogick Oct 30, 2018
64a475f
Merge branch 'master' into issue/#5065_no_ignore_flag_default_web
lunny Oct 31, 2018
a015d0b
Merge branch 'master' into issue/#5065_no_ignore_flag_default_web
techknowlogick Oct 31, 2018
2612a49
Merge branch 'master' into issue/#5065_no_ignore_flag_default_web
techknowlogick Oct 31, 2018
6e90f6e
Merge branch 'master' into issue/#5065_no_ignore_flag_default_web
techknowlogick Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"code.gitea.io/gitea/cmd"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you be able to remove this newline?

// register supported doc types
_ "code.gitea.io/gitea/modules/markup/csv"
_ "code.gitea.io/gitea/modules/markup/markdown"
Expand Down Expand Up @@ -48,7 +49,7 @@ arguments - which can alternatively be run by running the subcommand web.`
cmd.CmdAdmin,
cmd.CmdGenerate,
}
app.Flags = append(app.Flags, []cli.Flag{}...)
app.Flags = append(app.Flags, cmd.CmdWeb.Flags...)
app.Action = cmd.CmdWeb.Action
err := app.Run(os.Args)
if err != nil {
Expand Down