summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'if-64257-active_session_lookup_key_cleanup' into 'master'Bob Van Landuyt2019-07-231-0/+52
|\ | | | | | | | | Rake task to cleanup expired ActiveSession lookup keys See merge request gitlab-org/gitlab-ce!30668
| * Rake task to cleanup expired ActiveSession lookup keysif-64257-active_session_lookup_key_cleanupImre Farkas2019-07-221-0/+52
| | | | | | | | | | | | | | In some cases ActiveSession.cleanup was not called after authentication, so for some user ActiveSession lookup keys grew without ever cleaning up. This Rake task manually iterates over the lookup keys and removes ones without existing ActiveSession.
* | Merge branch 'gsemet/gitlab-ce-gsemet-master-patch-33258' into 'master'Sean McGivern2019-07-231-1/+3
|\ \ | | | | | | | | | | | | Multiple pipeline support for Build status See merge request gitlab-org/gitlab-ce!30828
| * | Add specs for specifying pipeline behaviorMatija Čupić2019-07-231-6/+3
| | | | | | | | | | | | | | | Adds specs for testing the new behavior of specifying a pipeline when POSTing a status.
| * | Multiple pipeline support for Build statusGaetan Semet2019-07-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | This allows user to specify the pipeline ID when several pipelines has been triggered on the same branch and commit. Signed-off-by: Gaetan Semet <gaetan.semet@renault.com>
* | | Merge branch 'georgekoltsov/64377-add-better-log-msg-to-members-mapper' into ↵Ash McKenzie2019-07-231-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add better error message to MembersMapper#ensure_default_member! See merge request gitlab-org/gitlab-ce!30838
| * | | Add changelog entrygeorgekoltsov/64377-add-better-log-msg-to-members-mapperGeorge Koltsov2019-07-231-1/+1
| | | |
| * | | Add better error message MembersMapper#ensure_default_member!George Koltsov2019-07-171-0/+2
| |/ / | | | | | | | | | More details in: https://gitlab.com/gitlab-org/gitlab-ce/issues/64377
* | | Merge branch 'rm-src-branch' into 'master'Grzegorz Bizon2019-07-231-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Support remove source branch on merge w/ push options See merge request gitlab-org/gitlab-ce!30728
| * | | Support rm src branch on merge w/ push optionChristian Couder2019-07-171-1/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `remove_source_branch` set using git push options. To create a new merge request and set it to remove the source branch when it is merged: git push -u origin -o merge_request.create \ -o merge_request.remove_source_branch To update an existing merge request and set it to remove the source branch when it is merged: git push -u origin -o merge_request.remove_source_branch Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* | | Bring backward compatibility for request profilesKamil Trzciński2019-07-232-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that we missed the backward compatibility support for profiles in the existing folder. This commit also fixes some specs to be idempotent and work in a temporary directory which not always seems to be the case. This commit also brings the profile_spec.rb which seems to be missing.
* | | Convert githost.log to JSON formatStan Hu2019-07-221-5/+1
| | | | | | | | | | | | | | | This will make it easier to parse this in production and adds the `correlation_id` if available.
* | | Merge branch 'maintainers-can-create-subgroup' into 'master'Sean McGivern2019-07-221-0/+11
|\ \ \ | | | | | | | | | | | | | | | | Add a group setting to allow Maintainers to create sub-groups See merge request gitlab-org/gitlab-ce!29718
| * | | Add "allowed to create subgroups" dropdown to group settings formFabio Papa2019-07-191-0/+7
| | | |
| * | | Add constants representing Owner and Maintainer group access levelsFabio Papa2019-07-191-0/+4
| | | |
* | | | OAuth2 support for GitLab personal access tokensSteve Abrams2019-07-221-3/+14
| |_|/ |/| | | | | | | | | | | | | | PATs are accepted using the OAuth2 compliant header "Authorization: Bearer {token}" in order to allow for OAuth requests while 2FA is enabled.
* | | Count wiki page creationAlex Kalderimis2019-07-213-6/+51
|/ / | | | | | | | | | | | | This adds a counter to count page creation, which is reflected in the usage-data we collect. The number created is stored in Redis, avoiding DB access.
* | Merge branch 'sh-fix-gitaly-server-info-cache' into 'master'Mayra Cabrera2019-07-191-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix Gitaly auto-detection caching Closes #64802 See merge request gitlab-org/gitlab-ce!30954
| * | Fix Gitaly auto-detection cachingStan Hu2019-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If `GitalyClient#can_use_disk?` returned `false`, it was never cached properly and led to excessive number of Gitaly calls. Instead of using `cached_value.present?`, we need to check `cached_value.nil?`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64802
* | | Document database review processToon Claes2019-07-191-0/+26
| | | | | | | | | | | | See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6069
* | | Merge branch '30939-remove-worker-label-from-ruby-sampler-metrics' into 'master'Kamil Trzciński2019-07-191-19/+6
|\ \ \ | | | | | | | | | | | | | | | | Get rid of `worker_label` in RubySampler See merge request gitlab-org/gitlab-ce!30942
| * | | Get rid of `worker_label` in RubySampler30939-remove-worker-label-from-ruby-sampler-metricsAleksei Lipniagov2019-07-191-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | We have Prometheus::PidProvider which sets correct worker id for a process, so such implementation of `worker_label` in the sampler is obsolete.
* | | | Avoid increasing redis counters when usage_ping is disabledFrancisco Javier López2019-07-191-0/+2
| |/ / |/| |
* | | Merge branch '64722-mg-export-frontend-fixtures' into 'master'Phil Hughes2019-07-192-9/+23
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Resolve "Export frontend fixtures as pipeline artifact" Closes #64722 and #59166 See merge request gitlab-org/gitlab-ce!30917
| * | Move frontend fixtures into spec/frontendMike Greiling2019-07-191-1/+1
| | | | | | | | | | | | | | | Moves every fixture source file from spec/javascripts to spec/frontend
| * | Rename the karma:fixtures taskMike Greiling2019-07-192-9/+23
| | | | | | | | | | | | | | | | | | Introduces frontend:fixtures rake task to replace karma:fixtures and update documentation and CI scripts to match
* | | Adjust redis cache metricsBen Kochie2019-07-191-3/+12
| | | | | | | | | | | | | | | | | | * Remove `controller` and `action` labels from duration histogram. * Create a new simple counter for `controller` and `action`. * Adjust histogram buckets to observe smaller response times.
* | | Added Usage Data for some Web IDE actionsFrancisco Javier López2019-07-192-1/+21
| | | | | | | | | | | | | | | | | | | | | The actions tracked in the web IDE are: - creation of commits - creation of merge requests - projects loaded
* | | Merge branch '64295-predictable-environment-slugs' into 'master'Lin Jen-Shin2019-07-191-0/+58
|\ \ \ | | | | | | | | | | | | | | | | Use predictable environment slugs See merge request gitlab-org/gitlab-ce!30551
| * | | Introduce predictable environment slugs64295-predictable-environment-slugsTiger2019-07-191-0/+58
| |/ / | | | | | | | | | | | | | | | | | | If an environment slug is predictable given only the environment name, we can use the environment slug earlier in the CI variable evaluation process as we don't have to wait for the environment record itself to be persisted.
* | | Set Private visibility for restricted Internal imported projectsGeorge Koltsov2019-07-191-0/+1
|/ / | | | | | | | | | | | | | | | | With https://gitlab.com/gitlab-org/gitlab-ee/issues/12388 change going live there is potential risk of breaking imports of 'Internal' projects. This change makes sure if 'Internal' visibility level is restricted all 'Internal' projects will be marked as 'Private' See: https://gitlab.com/gitlab-org/gitlab-ce/issues/64311
* | Merge branch 'an-sidekiq-chaos' into 'master'Lin Jen-Shin2019-07-181-0/+49
|\ \ | | | | | | | | | | | | | | | | | | Adds chaos endpoints to Sidekiq Closes #64663 See merge request gitlab-org/gitlab-ce!30814
| * | Adds chaos endpoints to Sidekiqan-sidekiq-chaosAndrew Newdigate2019-07-181-0/+49
| | | | | | | | | | | | | | | This allows the chaos endpoints to be invoked in Sidekiq so that this environment can be tested for resilience.
* | | Improves add_timestamps_with_timezone helperAlex Kalderimis2019-07-181-10/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the `add_timestamps_with_timezone` helper by allowing the column names to be configured. This has the advantage that unnecessary columns can be avoided, saving space. A helper for removing the columns is also provided, to be used in the `down` method of migrations.
* | | Merge branch 'sh-add-rugged-logs' into 'master'Douglas Barbosa Alexandre2019-07-183-1/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Rugged calls and duration to API and Rails logs Closes #64676 See merge request gitlab-org/gitlab-ce!30871
| * | | Add Rugged calls and duration to API and Rails logsStan Hu2019-07-183-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds `rugged_duration_ms` and `rugged_calls` fields to `api_json.log` and `production_json.log`. This will make it easier to identify performance issues caused by excessive I/O. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64676
* | | | Merge branch 'add-profile-mode-to-extend-request-profiling' into 'master'Kamil Trzciński2019-07-182-13/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add profile mode to extend request profiling See merge request gitlab-org/gitlab-ce!30126
| * | | | Add profile mode to extend request profilingadd-profile-mode-to-extend-request-profilingQingyu Zhao2019-07-182-13/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the support for "X-Profile-Token: <token>" to have an additional header that defines type of profile we are looking for, like: X-Profile-Mode: execution X-Profile-Mode: memory
* | | | | Fix pid providing for PrometheusAleksei Lipniagov2019-07-181-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use relative worker identifier for metrics (instead of Process.pid) and identify when Unicorn/Puma/Sidekiq is used. Previously, it was assumed that all metrics are gathered from Unicorn due to hardcoded implementation which was incorrect.
* | | | | Merge branch 'sh-fix-redis-performance-bar' into 'master'Mayra Cabrera2019-07-181-15/+33
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistency in Redis performance bar stats Closes #64707 See merge request gitlab-org/gitlab-ce!30866
| * | | | Fix inconsistency in Redis performance bar statssh-fix-redis-performance-barStan Hu2019-07-171-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | peek-redis resets its counters at the start of an ActionController notification (`start_processing.action_controller`), which causes it to miss some Redis queries that precede it, such as the database load balancer and Rack Attack queries. This produces inconsistencies in the performance bar between the number of calls and their durations with the actual calls in the detailed view. We fix this by getting rid of peek-redis in favor of consolidating all logic into the `RedisDetailed` view, which tracks Redis queries using `RequestStore`. This has the nice property of removing thread-specific counters as well. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64707
* | | | | Merge branch 'ci_default_git_depth_only' into 'master'Douglas Barbosa Alexandre2019-07-181-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | API: Allow changing only ci_default_git_depth See merge request gitlab-org/gitlab-ce!30888
| * | | | | API: Allow changing only ci_default_git_depthMathieu Parent2019-07-181-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'webide-commit-use-correct-parent' into 'master'Nick Thomas2019-07-184-11/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use correct parent when committing in WebIDE See merge request gitlab-org/gitlab-ce!29598
| * | | | | Add start_sha to commits APIMarkus Koller2019-07-184-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing start_branch on committing from the WebIDE, it's possible that the branch has changed since editing started, which results in the change being applied on top of the latest commit in the branch and overwriting the new changes. By passing the start_sha instead we can make sure that the change is applied on top of the commit which the user started editing from.
* | | | | | Merge branch 'feature/gb/serverless-app-deployment-template' into 'master'Thong Kuah2019-07-181-8/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy serverless apps with `gitlabktl` Closes #64494 See merge request gitlab-org/gitlab-ce!30740
| * | | | | | Deploy serverless apps with `gitlabktl`Grzegorz Bizon2019-07-151-8/+5
| | | | | | |
* | | | | | | Merge branch 'adjust-cycle-analytics-to-group-level' into 'master'Sean McGivern2019-07-1816-29/+188
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Adjust cycle analytics to group level See merge request gitlab-org/gitlab-ce!30391
| * | | | | | Add code review remarksMałgorzata Ksionek2019-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change small things for better readability
| * | | | | | Add code review remarksMałgorzata Ksionek2019-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make specs more readable
View Lorry Controller Status