Skip to content
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.

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

fix RRD summary to properly computate data volume for previous month #185

Merged
merged 1 commit into from
Dec 5, 2016
Merged

fix RRD summary to properly computate data volume for previous month #185

merged 1 commit into from
Dec 5, 2016

Conversation

razzfazz
Copy link
Contributor

@razzfazz razzfazz commented Sep 6, 2016

No description provided.

@netgate-git-updates
Copy link

Before this pull request can be accepted you must first sign a CLA as described at https://www.pfsense.org/about-pfsense/#cla. Please read for more details.

@rbgarga
Copy link
Member

rbgarga commented Sep 14, 2016

@razzfazz could you please sign the CLA? Otherwise we cannot accept patches from you. Thanks!

@razzfazz
Copy link
Contributor Author

Done.

@jdillard
Copy link
Contributor

jdillard commented Dec 5, 2016

Thanks @razzfazz! Apologies for the delay.

@doktornotor
Copy link
Contributor

@rbgarga @jdillard - Can we get this to RELENG_2_3_2? Still confusing users. https://forum.pfsense.org/index.php?topic=122771.0

@gonzopancho
Copy link
Member

it's on RELENG_2_3, so it will make it into 2.3.3, assuming we ever cut a 2.3.3-RELEASE.

We've already released 2.3.2, so it shouldn't go on RELENG_2_3_2

@doktornotor
Copy link
Contributor

@gonzopancho - Hmm, I really don't see the point in not fixing buggy packages in a stable supported release.

@rbgarga
Copy link
Member

rbgarga commented Dec 22, 2016

I cherry-picked it to RELENG_2_3_2, package update will show up soon

netgate-git-updates pushed a commit that referenced this pull request Jun 15, 2020
Build now explicitly requires gmake

per https://github.com/yaml/libyaml/releases/tag/0.2.5
the following changes have been made

- #105
  Allow question marks in plain scalars in flow collections

- #186
  Emitter: Don't output trailing space for empty scalar nodes

- #185
  Emitter: Output space after an alias mapping key

- #187
  Add -h and --flow (on|off|keep) to run-*-test-suite

- #182
  Remove unnecessary include and malloc

- #177
  Add specific files back to .gitignore

- #181
  Output error position in run-parser-test-suite.c

- #191
  A couple patches to improve test suite support

- #179
  Flow indicators can not be part of local or shorthand tags

PR:	247043
Submitted by:	[email protected]
netgate-git-updates pushed a commit that referenced this pull request Mar 28, 2023
v1.8.5 (2023-02-02)

    [#186] Simplify gem configuration reusing Doorkeeper configuration option DSL (thanks to @nbulaj).
    [#182] Drop support for Ruby 2.6 and Rails 5 (thanks to @sato11).
    [#188] Fix dookeeper-jwt compatibility (thanks to @zavan).

v1.8.4 (2023-02-01)

    [#177] Replace json-jwt with ruby-jwt to align with doorkeeper-jwt (thanks to @kristof-mattei).
    [#185] Don't call active_record_options for Doorkeeper >= 5.6.3 (thanks to @zavan).
    [#183] Stop render consent screen when user is not logged-in (thanks to @nov).

Changelog:
https://github.com/doorkeeper-gem/doorkeeper-openid_connect/blob/master/CHANGELOG.md

Fixes also a problem with www/gitlab-ce:
rake aborted!
NoMethodError: undefined method `active_record_options' for #<Doorkeeper::Config:0x000000081fb0f0c8 @Orm=:active_record, @default_generator_method=:hex, @authenticate_resource_owner=#<Proc:0x000000081fb0ed80 /usr/local/www/gitlab-ce/config/initializers/doorkeeper.rb:13>, @resource_owner_from_credentials=#<Proc:0x000000081fb0ec68 /usr/local/www/gitlab-ce/config/initializers/doorkeeper.rb:25>, @refresh_token_enabled=true, @enforce_configured_scopes=true, @force_ssl_in_redirect_uri=false, @forbid_redirect_uri=#<Proc:0x000000081fb0ea10 /usr/local/www/gitlab-ce/config/initializers/doorkeeper.rb:67>, @enable_application_owner=true, @default_scopes=#<Doorkeeper::OAuth::Scopes:0x000000081fb17e30 @scopes=["api"]>, @optional_scopes=#<Doorkeeper::OAuth::Scopes:0x000000081fb177f0 @scopes=["read_api", "read_user", "read_repository", "write_repository", "sudo", "openid", "profile", "email"]>, @access_token_methods=[:from_access_token_param, :from_bearer_authorization, :from_bearer_param], @token_secret_strategy=Gitlab::DoorkeeperSecretStoring::Token::Pbkdf2Sha512, @token_secret_fallback_strategy=Doorkeeper::SecretStoring::Plain, @application_secret_strategy=Gitlab::DoorkeeperSecretStoring::Secret::Pbkdf2Sha512, @application_secret_fallback_strategy=Doorkeeper::SecretStoring::Plain, @grant_flows=["authorization_code", "password", "client_credentials"], @skip_authorization=#<Proc:0x000000081fb1ce58 /usr/local/www/gitlab-ce/config/initializers/doorkeeper.rb:109>, @base_controller="::Gitlab::BaseDoorkeeperController", @skip_client_authentication_for_password_grant=true, @application_model=Doorkeeper::Application(id: integer, name: string, uid: string, secret: string, redirect_uri: text, scopes: string, created_at: datetime, updated_at: datetime, owner_id: integer, owner_type: string, trusted: boolean, confidential: boolean, expire_access_tokens: boolean), @access_grant_model=Doorkeeper::AccessGrant(id: integer, resource_owner_id: integer, application_id: integer, token: string, expires_in: integer, redirect_uri: text, created_at: datetime, revoked_at: datetime, scopes: string, code_challenge: text, code_challenge_method: text), @access_token_model=Doorkeeper::AccessToken(id: integer, resource_owner_id: integer, application_id: integer, token: string, refresh_token: string, expires_in: integer, revoked_at: datetime, created_at: datetime, scopes: string)>

          if Doorkeeper.configuration.active_record_options[:establish_connection]
                                     ^^^^^^^^^^^^^^^^^^^^^^
/usr/local/www/gitlab-ce/config/environment.rb:7:in `<top (required)>'
Tasks: TOP => db:migrate => db:load_config => environment
(See full trace by running task with --trace)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants