summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-guard-read-only-user-updates' into 'master'Nick Thomas2018-02-191-0/+8
|\ | | | | | | | | | | | | Don't attempt to update user tracked fields if database is in read-only Closes gitlab-ee#4972 See merge request gitlab-org/gitlab-ce!17200
| * Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updatesStan Hu2018-02-171-0/+8
| | | | | | | | | | | | | | | | With Geo, attempting to view an endpoint with a user could result in an Error 500 since Devise attempts to update the last sign-in IP and other details. Closes gitlab-org/gitlab-ee#4972
* | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵Douwe Maan2018-02-191-7/+29
|\ \ | |/ |/| | | | | | | | | | | | | into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!17138
| * Validate SSH keys through the sshkey gemrd-40552-gitlab-should-check-if-keys-are-valid-before-savingRubén Dávila2018-02-161-18/+3
| |
| * Revert "Merge branch ↵Rubén Dávila2018-02-151-7/+44
| | | | | | | | | | | | 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'" This reverts commit e607fd796657afd214b8f25201919d3e33b3f35f.
* | Merge branch 'change/strip-whitespace-from-username-input#42637' into 'master'Rémy Coutable2018-02-151-0/+8
|\ \ | | | | | | | | | | | | | | | | | | Trim whitespace from input in the username/email form field Closes #42637 See merge request gitlab-org/gitlab-ce!17020
| * | Strip whitespace from username/login value for user lookupPeter Lauck2018-02-131-0/+8
| |/ | | | | | | | | | | | | As per the discussion with @psimyn, this change does not affect the frontend, so user input will not be validated on the signin screen. Instead, the value sent to the backend has leading and trailing whitespace stripped before looking up the user with find_by. Closes #42637
* | Merge branch 'sh-fix-error-500-licensee' into 'master'Douwe Maan2018-02-151-0/+12
|\ \ | | | | | | | | | | | | | | | | | | Fix Error 500s loading repositories with inconsistent HEAD Closes #43268 See merge request gitlab-org/gitlab-ce!17128
| * | Simplify license generator error handlingStan Hu2018-02-141-3/+2
| | |
| * | Fix Error 500s loading repositories with no master branchStan Hu2018-02-141-0/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We removed the exception handling for Rugged errors in !16770, which revealed that the licensee gem attempts to retrieve a license file via Rugged in `refs/heads/master` by default. If that branch did not exist, a Rugged::ReferenceError would be thrown. There were two issues: 1. Not every project uses `master` as the default branch. This change uses the head commit to identify the license. 2. Removing the exception handling caused repositories to fail loading. We can safely catch and ignore any Rugged error because this means we weren't able to load a license file. Closes #43268
* | Fixed user synced attributes metadata after removing current providerFrancisco Javier López2018-02-151-0/+33
|/
* Revert "Merge branch ↵rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-keyRubén Dávila2018-02-121-44/+7
| | | | | | | 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" This reverts commit a58f8c32c62bcf5824d1fe1d0de53e9bda974d65, reversing changes made to cd5d75c362cdf06efb8174eddfbd0f4b65687dec.
* Merge branch '40994-fix-ee-ce-compatible-test' into 'master'Kamil Trzciński2018-02-121-1/+1
|\ | | | | | | | | | | | | Make GITLAB_FEATURES in build_spec compatible with EE Closes #40994 See merge request gitlab-org/gitlab-ce!17023
| * Make GITLAB_FEATURES in build_spec compatible with EE40994-fix-ee-ce-compatible-testDylan Griffith2018-02-091-1/+1
| | | | | | | | | | Right now this fails in EE since the EE codebase defaults to having a starter license which means there are features in this value. This seems to be incompatible with the statement that tests should behave the same in CE as EE but I think that since there is a before on all EE specs creating a starter license it unfortunately does not behave that way. This is needed for #40994 and fixes the failing specs in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4393
* | Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'Kamil Trzciński2018-02-093-8/+16
|/ | | | Fix using wildcards in protected tags to expose protected variables
* Merge branch '40744-hashed-storage-specs' into 'master'Sean McGivern2018-02-082-89/+148
|\ | | | | | | | | | | | | Use hashed storage in the specs Closes #40744 See merge request gitlab-org/gitlab-ce!15681
| * Use hashed storage in the specs40744-hashed-storage-specsNick Thomas2018-02-072-89/+148
| |
* | Merge branch 'feature/oidc-groups-claim' into 'master'Douwe Maan2018-02-081-1/+24
|\ \ | | | | | | | | | | | | Add groups to OpenID Connect claims See merge request gitlab-org/gitlab-ce!16929
| * | Add groups to OpenID Connect claimsHassan Zamani2018-02-081-1/+24
| | |
* | | Merge branch '40994-expose-features-as-ci-cd-variable' into 'master'Kamil Trzciński2018-02-081-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Expose GitLab license/plan as a CI/CD variable" Closes #40994 See merge request gitlab-org/gitlab-ce!16936
| * | | Expose GITLAB_FEATURES as CI/CD variable (fixes #40994)40994-expose-features-as-ci-cd-variableDylan Griffith2018-02-071-0/+1
| | | |
* | | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-072-10/+299
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
| * | | | Make prometheus service querying approach much nicer wrt to arity and ↵Pawel Chojnacki2018-02-071-0/+19
| | | | | | | | | | | | | | | | | | | | default function params
| * | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0616-145/+425
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ...
| * | | | | fix tests for find or initialize service 'prometheus'Pawel Chojnacki2018-02-061-1/+1
| | | | | |
| * | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-315-10/+55
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (119 commits) [ci skip] Fix example commands to refer to the correct versions Use axios instead of jquery ajax for setCiStatusFavicon refactor groups controller to match EE Fix broken test Introduce a new QA::Gitlab::Page::Component::Dropzone class Gitaly Server info for admin panel Add note about being in the `qa` directory for `bin/qa` to work Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints Fix not all events being shown in group dashboard Add support for PreReceiveError in UserMergeBranch RPC Migrate Git::Repository#delete_refs to Gitaly Replace $.get in render math with axios Move mr widget related links into a vue file Make those files as close as EE to reduce conflicts Don't assume postgresql in two initializers Move Repository#can_be_merged? to Gitlab::Git::Repository Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job Update Nokogiri to 1.8.2 Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck Remove Rugged exception in cache rescue ...
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-2918-75/+318
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-1720-130/+819
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| * | | | | | | | Fix rubocop warningsPawel Chojnacki2018-01-042-9/+12
| | | | | | | | |
| * | | | | | | | Test Prometheus proxy client generationPawel Chojnacki2018-01-041-0/+51
| | | | | | | | |
| * | | | | | | | add tests for Manual configuration override and service activation ↵Pawel Chojnacki2018-01-041-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronization
| * | | | | | | | Cleanup PrometheusService testsPawel Chojnacki2018-01-041-33/+38
| | | | | | | | |
| * | | | | | | | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-041-0/+127
| | | | | | | | |
| * | | | | | | | Add test checking if prometheus integration is enabled after prometheus is ↵Pawel Chojnacki2018-01-041-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed
* | | | | | | | | Removing gitaly flagsFrancisco Javier López2018-02-071-105/+124
| | | | | | | | |
* | | | | | | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-073-0/+80
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch ↵Kamil Trzciński2018-02-072-12/+135
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour' into 'master' Resolve "StuckCiJobsWorker wrongly detects, cancels 'stuck' builds when per-job timeout is more than an hour" Closes #38265, #42196, and #42750 See merge request gitlab-org/gitlab-ce!16756
| * | | | | | | | Fix RedisCacheable#cache_attributes spec38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hourMatija Čupić2018-02-061-6/+2
| | | | | | | | |
| * | | | | | | | Check return value in RedisCacheable#cached_attribute specMatija Čupić2018-02-061-3/+8
| | | | | | | | |
| * | | | | | | | Use double instead of runner in RedisCacheable specMatija Čupić2018-02-061-5/+9
| | | | | | | | |
| * | | | | | | | Extract attribute caching to RedisCacheable concernMatija Čupić2018-02-051-0/+34
| | | | | | | | |
| * | | | | | | | Improve runner attribute cachineMatija Čupić2018-02-051-10/+15
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into ↵Matija Čupić2018-02-0413-142/+200
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour
| * | | | | | | | | Expect instead of allow Redis get stub for online? specMatija Čupić2018-02-041-1/+1
| | | | | | | | | |
| * | | | | | | | | Refactor runner attribute caching implementationMatija Čupić2018-02-041-16/+16
| | | | | | | | | |
| * | | | | | | | | Use faster model updates in #update_runner_info specMatija Čupić2018-01-291-2/+2
| | | | | | | | | |
| * | | | | | | | | Make Ci::Runner#online? slightly more performantMatija Čupić2018-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a small refactor to avoid querying Redis when we know there's nothing in it.
| * | | | | | | | | Generelized cached attribute usage in runnerMatija Čupić2018-01-291-6/+11
| | | | | | | | | |
| * | | | | | | | | Move info update implementation to Ci::Runner modelMatija Čupić2018-01-291-5/+47
| | | | | | | | | |
| * | | | | | | | | Check cache in Ci::Runner#online?Matija Čupić2018-01-291-12/+42
| | | | | | | | | |
View Lorry Controller Status