kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/lib/gitlab
History
Pawel Chojnacki 57de968a92 Squashed commit of the following: 
commit 22e1cb8f4b98f71d21026f69aa3e68d79946d6ae
Merge: 766a42a9639 e966c6aea2
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Fri Feb 23 21:30:46 2018 +0100

    Merge remote-tracking branch 'upstream/master' into 38783-add-cluster-metrics.yml

    # Conflicts:
    #	app/controllers/projects/prometheus/metrics_controller.rb
    #	app/controllers/projects/prometheus_controller.rb
    #	app/models/project_services/prometheus_service.rb
    #	lib/gitlab/prometheus/queries/query_additional_metrics.rb
    #	spec/controllers/projects/prometheus/metrics_controller_spec.rb
    #	spec/models/project_services/prometheus_service_spec.rb

commit 766a42a96393f502d439c1f0beb0b6cfb2c228d4
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Fri Feb 23 17:58:45 2018 +0100

    Move prometheus adapter to app/models/concerns

commit ca84eed49811cf3064a2e5ea611af1c947c590d7
Merge: 66702099586 cb504cedc2a
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Fri Feb 23 15:36:03 2018 +0100

    Merge remote-tracking branch 'upstream/backport_custom_metrics_ce_components' into 38783-add-cluster-metrics.yml

    + fix failing tests

    # Conflicts:
    #	app/controllers/projects/prometheus_controller.rb
    #	app/models/project_services/prometheus_service.rb
    #	lib/gitlab/prometheus/queries/query_additional_metrics.rb
    #	spec/models/project_services/prometheus_service_spec.rb

commit cb504cedc2a6e353ffb56833334681e3da09fc14
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Fri Feb 23 14:46:15 2018 +0100

    Fix prometheus_service found by find_or_initialize_service

commit 928b84c72c2c4c46e1785b9a943c1822a137de16
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 23:15:11 2018 +0100

    additional metrics and backported tests

commit 41291383b4b6976af94eaf9e1a7b2e2a172310e7
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 21:57:45 2018 +0100

    Introduce Metrics controller and retire prometheus controller

commit 6e7492e4c7ffa9d8621f09198071bc14be875976
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 21:46:37 2018 +0100

    Backport PrometheusClient::Error and all->common_metrics rename

commit 66702099586c864a7f78970a0ee0dd9f3c2beeef
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 20:23:03 2018 +0100

    fix failing tests

commit ce921ea723cde61b2441ba98c9aca97606c719c8
Author: Mike Greiling <mike@pixelcog.com>
Date:   Wed Feb 21 23:47:30 2018 -0600

    add labels to cluster metrics

commit 993830c6892e4fbf53d3f72da00002d642c7e9b2
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 01:20:49 2018 +0100

    Fix formatting probelms and few small tests

commit 66ee65d8e3f747c90d986bc3056178422156bc8e
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 01:08:03 2018 +0100

    stop using in deployment tests environment.id

commit 62c91978d15f0369988521363dae24bd7510d68d
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 01:06:33 2018 +0100

    fix prometheus_controller and adapter tests

commit 977b1d34c1d03c7233582e8328f85caf634895ed
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 00:19:39 2018 +0100

    finish up active? -> can_query? rename

commit e614f7daee58a9758d83ba3efe1649c8b80bc1e2
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Wed Feb 21 23:51:33 2018 +0100

    deployment prometheus adapter tests fix

commit ebd726c114a6026fef0adf3eba6ee1972530148a
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Wed Feb 21 21:40:40 2018 +0100

    Move environment dependant tests to environment

commit 6d31311cd3729c29233283dded70e03a4a9a3c97
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Wed Feb 21 20:40:24 2018 +0100

    update monitoring service and move adding dpeloyment_time to deployment model

commit 60b6bf391ab36846dce122bc6b0c5196a186267c
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Wed Feb 21 20:15:46 2018 +0100

    adjust deployment spec and prometheus specs

commit 6681662cf1c028aff2ff94aa0501732cb7119ba1
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 22:30:20 2018 +0100

    Revert changes to reactive caching

commit e282f86c45a056889f57d3f7fd23a81c88efff6a
Merge: 5751c73df59 6844a2df87
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 22:08:17 2018 +0100

    Merge remote-tracking branch 'upstream/master' into 38783-add-cluster-metrics.yml

commit 5751c73df59d0a03840a1b4b71b0637670f971a6
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 22:07:43 2018 +0100

    rename active? to can_query? and cleanup environment prometheus router

commit 3f3c6e1d33dcd9315979daf26a95f2aab83a7de9
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 21:51:43 2018 +0100

    Fix tests, and only use prometheus service if its active

commit 6345838bac584c213b665d334252ccab202cb271
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 16:24:27 2018 +0100

    Fix typo

commit 7a585d32afe8da050b5615b1d036a550e06479f5
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 15:29:40 2018 +0100

    Cluster id is not required

commit e6af62afb11fa380f6aff1c31a81bcc9bab3b1eb
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 15:15:46 2018 +0100

    Result transformation support

commit f3b1bd7c67894f44efe33591ddb70093bd620c03
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 15:07:07 2018 +0100

    Fix rubocop warning and exten cluster query timeframe

commit be77947cea64261a4d3dead33c3c57f413a9880c
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 14:42:47 2018 +0100

    Fix additional metrics test

commit eb3922e16221abe16f59fae1c38122f227643343
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 14:34:44 2018 +0100

    rename prometheus adapter methods

commit 045476cd08b21593818b274ae8a44d19b705523f
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 13:19:36 2018 +0100

    Make prometheus adapter a module

commit f2daf050d8c689f72c4c61207930bc53c331f12e
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 12:00:44 2018 +0100

    refactoring wip

commit 52e4ef5587794e811dc10a0f2dca522342a865da
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Sun Feb 18 20:25:55 2018 +0100

    cleanup prometheus adapter concept

commit 3887365faab9dfcd9c00bcfc501d09ac62431a03
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Sun Feb 18 19:22:11 2018 +0100

    Refactor out deployment id, Rename PrometheusQuerier to PrometheusAdapter

commit aa2fc2df57bd72c9a5e94f66d1f1e23990be6c3f
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Fri Feb 16 23:59:54 2018 +0100

    Refactor prometheus client

commit e43c1ca9d9874d6cf1569f40fa1aca158d9d5d91
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 15 20:24:45 2018 +0100

    Use initial version of cluster_metrics.yml

commit 867821ce0b2609ebf8994220aa8e3a94d66a01e0
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 15 05:24:14 2018 +0100

    Fix querying cluster metrics

commit 1601e002a064cbb10ffe110a19433c5662858f1d
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 15 04:49:03 2018 +0100

    Queues for unicersal querier

commit 5db198fdc925c0223be24939b76da1d544dd569c
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 15 03:35:17 2018 +0100

    refactor reactive caching and prometheus querying

commit b0fc00e8c9d21e961ef44b0129103e2a62928b52
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 15 00:12:03 2018 +0100

    Add generic query additional metrics

commit ffe76e6a9ba196bccff22c4880e0384959ad5e48
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 13 15:40:15 2018 +0100

    Cluster Metric yml initial

+ Remove cluster query

+ remove cluster_metrics.yml

+ Prometheus adapter tests
2018-02-24 00:15:12 +01:00
..
auth Allow token authentication on go-get request 2018-02-23 10:33:46 +00:00
background_migration Use convenient Rails helper 2018-02-21 10:04:42 -08:00
badge Change coverage badge rounding for other CI system consistency 2018-02-01 17:40:26 -06:00
bare_repository_import Look for rugged with static analysis 2018-01-25 14:05:11 +01:00
bitbucket_import
cache
checks Merge branch 'jej/avoid-slow-file-lock-checks' into 'master' 2018-02-19 15:50:54 +00:00
ci Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master' 2018-02-07 13:09:56 +00:00
conflict Simplify conflict resolution interface and code 2018-01-02 16:22:02 -03:00
cross_project_access Port read_cross_project ability from EE 2018-02-22 17:11:36 +01:00
cycle_analytics Remove soft removals related code 2018-01-08 17:04:45 +01:00
data_builder
database Use has_table_privilege for TRIGGER on PostgreSQL 2018-01-22 13:43:38 +01:00
dependency_linker Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
diff Fix 500 error when diff context line has broken encoding 2018-02-22 12:26:23 +00:00
downtime_check
email Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
etag_caching
fogbugz_import Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
gfm add the uploader context to the upload model 2018-02-02 09:28:15 -05:00
git Merge branch 'fix-squash-with-renamed-files' into 'master' 2018-02-22 11:35:34 +00:00
gitaly_client Incorporate Gitaly's RepositoryService.IsSquashInProgress RPC 2018-02-21 17:35:31 -03:00
github_import [GH Import] Create an empty wiki if wiki import failed 2018-02-19 17:56:33 +00:00
gitlab_import
google_code_import Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
gpg Fix Error 500 when viewing a commit with a GPG signature in Geo 2018-02-19 00:22:13 -08:00
grape_logging Save user ID and username in Grape API log (api_json.log) 2018-01-08 21:23:24 -08:00
graphs
health_checks Add a gRPC health check to ensure Gitaly is up 2018-01-24 15:47:27 -08:00
hook_data Remove soft removals related code 2018-01-08 17:04:45 +01:00
i18n
import_export Merge branch 'fix/template-project-visibility' into 'master' 2018-02-14 12:38:51 +00:00
kubernetes Enable Prometheus metrics for deployed Ingresses 2018-02-05 12:46:31 +00:00
ldap Fixed user synced attributes metadata after removing current provider 2018-02-15 09:27:38 +00:00
legacy_github_import use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
metrics Guard against nil Sidekiq metrics server 2018-02-20 21:47:55 -08:00
middleware Allow token authentication on go-get request 2018-02-23 10:33:46 +00:00
o_auth Fixed bug with the user synced attributes when the user doesn't exist 2018-02-15 17:18:17 +01:00
performance_bar
popen Use Process::Status rather than an integer 2018-01-26 19:42:48 +08:00
project_authorizations
prometheus Squashed commit of the following: 2018-02-24 00:15:12 +01:00
query_limiting Do not count rails sql cache as queries in query limiting 2018-02-21 16:27:05 +11:00
quick_actions Resolve "Milestone Quick Action not displayed with no project milestones but with group milestones" 2018-02-23 14:23:09 +00:00
redis Eliminate the last warning for redis wrapper 2018-01-26 19:42:48 +08:00
request_profiler
saml
sanitizers
serializer
sherlock Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
sidekiq_middleware Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd 2018-02-06 11:14:45 -06:00
sidekiq_status
sidekiq_versioning Use a dedicated queue for each worker 2017-12-12 17:36:20 +01:00
slash_commands
sql Added changelog for user search improvements 2018-02-22 18:55:36 +01:00
storage_check Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
template
testing Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
utils Use Gitlab::Utils::Override over defined?(super) 2017-12-26 17:18:10 +08:00
view/presenter Present member collection at the controller level 2017-12-12 18:14:58 +01:00
access.rb
action_rate_limiter.rb Address review comments with playing pipeline scheduler 2017-12-12 17:12:45 -08:00
allowable.rb
app_logger.rb
asciidoc.rb Set Asciidoctor outfilesuffix to default .adoc 2018-02-14 20:40:47 +00:00
auth.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
background_migration.rb
blame.rb
changes_list.rb
chat_name_token.rb
ci_access.rb
closing_issue_extractor.rb
color_schemes.rb
config_helper.rb
contributions_calendar.rb Port read_cross_project ability from EE 2018-02-22 17:11:36 +01:00
contributor.rb
cross_project_access.rb Port read_cross_project ability from EE 2018-02-22 17:11:36 +01:00
current_settings.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
daemon.rb
database.rb Merge branch 'mk-add-old-attachments-to-uploads-table' into 'master' 2017-12-07 02:34:58 +00:00
dependency_linker.rb
downtime_check.rb
ee_compat_check.rb Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck 2018-01-30 18:22:36 +01:00
emoji.rb
encoding_helper.rb Return a warning string if we try to encode to unsupported encoding 2018-02-09 22:19:43 +01:00
environment.rb
environment_logger.rb
exclusive_lease.rb Run background migrations with a minimum interval 2018-01-05 16:23:25 +01:00
fake_application_settings.rb
file_detector.rb Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
file_finder.rb API - Include project in commits&blobs search results 2018-02-14 09:00:26 +01:00
git.rb Merge branch 'gitaly-970-repo-write-config' into 'master' 2018-02-01 19:46:32 +00:00
git_access.rb Fix repo existence check in GitAccessWiki 2018-02-22 00:20:30 +00:00
git_access_wiki.rb Fix repo existence check in GitAccessWiki 2018-02-22 00:20:30 +00:00
git_logger.rb
git_post_receive.rb
git_ref_validator.rb
gitaly_client.rb Rename Concern -> Methods 2018-01-29 15:13:05 +01:00
github_import.rb
gl_id.rb
gl_repository.rb
gon_helper.rb Merge branch 'master' into jivl-update-katex 2018-02-05 15:16:41 -06:00
gpg.rb
group_hierarchy.rb
highlight.rb
i18n.rb
identifier.rb Allow git pull/push on project redirects 2017-12-08 17:42:43 +00:00
import_export.rb Bump import/export version to 2.2.0 2018-01-05 15:18:17 +01:00
import_formatter.rb
import_sources.rb add note to import sources 2018-01-03 09:31:32 +01:00
incoming_email.rb
insecure_key_fingerprint.rb Backport authorized_keys branch 'find-key-by-fingerprint' 2018-01-08 20:34:16 +00:00
issuable_metadata.rb
issuable_sorter.rb
issuables_count_for_state.rb
issues_labels.rb
job_waiter.rb
kubernetes.rb
lazy.rb
lfs_token.rb
logger.rb
mail_room.rb
markup_helper.rb
metrics.rb Convert InfluxDB to concern. Fix uninitialized metrics when metrics code is inherited. 2018-01-29 15:13:04 +01:00
multi_collection_paginator.rb Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
o_auth.rb Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3' 2018-01-16 17:05:01 -08:00
optimistic_locking.rb
other_markup.rb
otp_key_rotator.rb
pages.rb
pages_transfer.rb
path_regex.rb Merge branch 'master' into '26388-push-to-create-a-new-project' 2018-02-06 19:14:43 +00:00
performance_bar.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
polling_interval.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
popen.rb Use Process::Status rather than an integer 2018-01-26 19:42:48 +08:00
profiler.rb Improve error handling for Gitlab::Profiler and improve doc about providing a user 2018-02-16 19:47:44 +11:00
project_search_results.rb API - Include project in commits&blobs search results 2018-02-14 09:00:26 +01:00
project_template.rb
project_transfer.rb
prometheus_client.rb Squashed commit of the following: 2018-02-24 00:15:12 +01:00
protocol_access.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
query_limiting.rb Disable query limiting warnings for now on GitLab.com 2018-02-12 11:41:03 -08:00
recaptcha.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
reference_counter.rb
reference_extractor.rb Refactor banzai to support referencing from group context 2017-12-06 19:16:22 +01:00
regex.rb Ensure users can't create environments with leading or trailing slashes (Fixes #39885) 2018-02-13 11:07:12 +11:00
repo_path.rb Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
repository_check_logger.rb
request_context.rb
request_forgery_protection.rb
request_profiler.rb
route_map.rb
routing.rb
search_results.rb API - Include project in commits&blobs search results 2018-02-14 09:00:26 +01:00
seeder.rb Mute notifications in the seeder to speed GDK development 2018-01-26 15:25:05 -08:00
sentry.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
setup_helper.rb 36847 - update toml-rb to 1.0.0 2018-02-21 22:09:15 +10:30
shell.rb Merge branch 'zj-namespace-gitaly-opt-out' into 'master' 2018-02-08 10:57:42 +00:00
shell_adapter.rb
sherlock.rb
sidekiq_config.rb Use a dedicated queue for each worker 2017-12-12 17:36:20 +01:00
sidekiq_logger.rb
sidekiq_status.rb
sidekiq_throttler.rb
sidekiq_versioning.rb Use a dedicated queue for each worker 2017-12-12 17:36:20 +01:00
snippet_search_results.rb Return only limited pagination headers for search API endpoints 2018-02-06 17:58:18 +01:00
ssh_public_key.rb Validate SSH keys through the sshkey gem 2018-02-16 11:32:08 -05:00
storage_check.rb Move the circuitbreaker check out in a separate process 2017-12-08 09:11:39 +01:00
string_range_marker.rb
string_regex_marker.rb
task_helpers.rb Fix rubocop offenses. It's not checked before when 2018-01-26 19:42:48 +08:00
tcp_checker.rb Add a gitlab:tcp_check rake task 2017-12-13 15:53:32 +00:00
themes.rb
time_tracking_formatter.rb
timeless.rb Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
untrusted_regexp.rb
update_path_error.rb
upgrader.rb Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
uploads_transfer.rb port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
url_blocker.rb
url_builder.rb
url_sanitizer.rb
usage_data.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
user_access.rb Port read_cross_project ability from EE 2018-02-22 17:11:36 +01:00
user_activities.rb
utils.rb Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-queue-through-web-hook' into 'security-10-3' 2018-01-16 17:04:51 -08:00
version_info.rb
visibility_level.rb Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into 'master' 2018-02-02 19:12:55 +00:00
workhorse.rb Upgrade GitLab Workhorse to v3.6.0 2018-02-06 15:34:44 +01:00