diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 197487fb..00c1f1e7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,7 +114,7 @@ jobs: - name: Build V shell: cmd run: | - make.bat -gcc + makev.bat -gcc # Must run after "Build V": the script shells out to `v.exe`, which # does not exist until V is built. - name: Install SQLite diff --git a/gitly.v b/gitly.v index 66ae334f..484b426b 100644 --- a/gitly.v +++ b/gitly.v @@ -93,8 +93,8 @@ fn new_app() !&App { mut app := &App{ // db: sqlite.connect('gitly.sqlite') or { panic(err) } - db: connect_db(conf)! - config: conf + db: connect_db(conf)! + config: conf started_at: time.now().unix() } @@ -747,6 +747,7 @@ fn (mut app App) migrate_tables() ! { app.add_missing_column('Issue', 'milestone_id', 'INTEGER NOT NULL DEFAULT 0')! app.add_missing_column('Issue', 'iteration_id', 'INTEGER NOT NULL DEFAULT 0')! app.add_missing_column('Issue', 'time_estimate_minutes', 'INTEGER NOT NULL DEFAULT 0')! + app.add_missing_column('Issue', 'is_confidential', db_bool_column_type())! app.add_missing_column('Label', 'scope', "TEXT NOT NULL DEFAULT ''")! app.add_missing_column('Project', 'label_id', 'INTEGER NOT NULL DEFAULT 0')! app.add_missing_column('Project', 'milestone_id', 'INTEGER NOT NULL DEFAULT 0')! @@ -914,7 +915,7 @@ fn (mut app App) add_missing_column(table_name string, column_name string, colum fn (mut ctx Context) json_success[T](result T) veb.Result { response := api.ApiSuccessResponse[T]{ success: true - result: result + result: result } return ctx.json(response) diff --git a/highlight/markdown_test.v b/highlight/markdown_test.v index c5823681..8406cb46 100644 --- a/highlight/markdown_test.v +++ b/highlight/markdown_test.v @@ -1,9 +1,9 @@ module highlight -const markdown = ' test' +const xss_markdown_sample = ' test' fn test_convert_markdown_to_html() { - rendered := convert_markdown_to_html(markdown) + rendered := convert_markdown_to_html(xss_markdown_sample) assert !rendered.contains('