summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master'Rémy Coutable2018-05-251-1/+1
|\ | | | | | | | | | | | | Resolve "gitlab 10.8 assumes that installation is a git working copy." Closes #46600 See merge request gitlab-org/gitlab-ce!19125
| * Replace Gitlab::REVISION with Gitlab.revision and handle installations ↵46600-fix-gitlab-revision-when-not-in-git-repoRémy Coutable2018-05-241-1/+1
| | | | | | | | | | | | without a .git directory Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'mr-conflict-notification' into 'master'Douwe Maan2018-05-241-22/+116
|\ \ | | | | | | | | | | | | MR unmergeable notification See merge request gitlab-org/gitlab-ce!18042
| * | Add specMark Chao2018-05-241-22/+34
| | |
| * | Add MergeRequest#merge_participantslulalala2018-05-171-0/+35
| | | | | | | | | For notifying via todo or email.
| * | Add cannot_be_merged_recheck merge_statuslulalala2018-05-171-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, transitions between can_be_merged & cannot_be_merged are removed, as they are currently blocked in `check_if_can_be_merged`. `can_be_merge` always returns to `unchecked` first, before it can transition to `cannot_be_merged` (and vice versa). We want to avoid repeated notification triggered by repeated transition between `cannot_be_merged` & `unchecked`. So we added `cannot_be_merged_recheck` state, similar to `unchecked`, but as a mean to remember it’s from cannot_be_merged. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407 Since `unchecked` and `cannot_be_merged_recheck` both mean “we are in the middle of checking if it is mergeable”, quite often we need to see if merge_status is in either one of them, so `check_state?` is added to achieve this.
* | | Merge branch 'jprovazn-fix-resolvable' into 'master'Douwe Maan2018-05-241-0/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Check if note's noteable is not nil when checking resolvability Closes #46573 See merge request gitlab-org/gitlab-ce!19081
| * | Check if note's noteable is not nil when checking resolvabilityjprovazn-fix-resolvableJan Provaznik2018-05-231-0/+8
| | | | | | | | | | | | | | | This can occur when a note is added to a commit and then this commit is deleted.
* | | Merge branch ↵Douwe Maan2018-05-233-52/+158
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master' Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`" Closes #45175 See merge request gitlab-org/gitlab-ce!18754
| * | | Use the new CacheableAttributes concern in the ApplicationSetting and ↵Rémy Coutable2018-05-232-52/+5
| | | | | | | | | | | | | | | | | | | | | | | | Appearance models Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Introduce a new CacheableAttributes concernRémy Coutable2018-05-231-0/+153
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master'Rémy Coutable2018-05-231-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Prometheus integration fails on k8s 1.10" Closes #46259 See merge request gitlab-org/gitlab-ce!19082
| * | | Update Prometheus URL spec for 1.10 formatJoshua Lambert2018-05-221-1/+1
| |/ /
* | | Resolve "Deprecate Gemnasium project service"Olivier Gonzalez2018-05-231-4/+29
| | |
* | | Merge branch 'dm-xcode-project-directory' into 'master'Robert Speicher2018-05-221-7/+7
|\ \ \ | | | | | | | | | | | | | | | | Fix Xcode project detection by looking for dirs instead of files See merge request gitlab-org/gitlab-ce!19035
| * | | Fix Xcode project detection by looking for dirs instead of filesdm-xcode-project-directoryDouwe Maan2018-05-221-7/+7
| | | |
* | | | Merge branch ↵Douwe Maan2018-05-221-18/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master' Resolve "notifications broken during email address change before email confirmed" Closes #22846 See merge request gitlab-org/gitlab-ce!18474
| * | | | Don't set the notification_email when only unconfirmed_email is changed22846-notifications-broken-during-email-address-change-before-email-confirmedRémy Coutable2018-05-221-18/+70
| | |/ / | |/| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Expose readme url in Project APIImre Farkas2018-05-221-0/+28
|/ / /
* | | Merge branch 'fix/gb/exclude-persisted-variables-from-environment-name' into ↵Grzegorz Bizon2018-05-212-2/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Do not allow to use `CI_PIPELINE_ID` in environment name Closes #46443 See merge request gitlab-org/gitlab-ce!19032
| * | | Update pipeline persisted / predefined variables specsGrzegorz Bizon2018-05-182-4/+8
| | | |
| * | | Separate persisted and runtime pipeline variablesGrzegorz Bizon2018-05-181-0/+8
| | | |
| * | | Do not allow to use `CI_PIPELINE_ID` in environment nameGrzegorz Bizon2018-05-181-0/+22
| |/ /
* | | Merge branch '46082-runner-contacted_at-is-not-always-a-time-type' into 'master'Kamil Trzciński2018-05-211-11/+72
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Runner#contacted_at is not always a Time type" Closes #46082 See merge request gitlab-org/gitlab-ce!18810
| * | | Remove rails5 specific tests for #cast_value_from_cacheMatija Čupić2018-05-171-24/+2
| | | |
| * | | Add test for #cast_value_from_cacheMatija Čupić2018-05-171-0/+36
| | | |
| * | | Revert "Move argument check to cached getter definition class method"Matija Čupić2018-05-161-2/+2
| | | | | | | | | | | | | | | | This reverts commit 4e1bb1d1014237df79db6b3cc2beb24228a4b228.
| * | | Move argument check to cached getter definition class methodMatija Čupić2018-05-161-2/+2
| | | |
| * | | Add attribute check in cached getterMatija Čupić2018-05-161-0/+4
| | | |
| * | | Dynamically cast value from cacheMatija Čupić2018-05-151-38/+4
| | | |
| * | | Check for exact time matchesMatija Čupić2018-05-141-6/+8
| | | |
| * | | Expect calls to read_attribute depending on cache presenceMatija Čupić2018-05-141-0/+8
| | | |
| * | | Add RedisCacheable specs for memoization correctnessMatija Čupić2018-05-121-7/+19
| | | |
| * | | Make #cached_attr_reader and #cached_attr_time_reader specs Redis basedMatija Čupić2018-05-121-8/+4
| | | |
| * | | Add specs for #cached_attr_reader and cached_attr_time_readerMatija Čupić2018-05-111-11/+70
| | | |
* | | | Merge branch '46454-wrong-value-in-ci-deploy-user' into 'master'Kamil Trzciński2018-05-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "CI/CD jobs: Wrong value in env. variable CI_DEPLOY_USER using <gitlab-deploy-token> deploy token" Closes #46454 See merge request gitlab-org/gitlab-ce!19047
| * | | | Fixes deploy tokens build variables46454-wrong-value-in-ci-deploy-userMayra Cabrera2018-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was using name, instead of username. Fixes documentation as well Closes #46454
* | | | | Remove unnecessary `with` from `allow`fix-kube_client-proxy_url-exceptionShinya Maeda2018-05-211-1/+1
| | | | |
* | | | | Add spec for unathrozied proxy_urlShinya Maeda2018-05-211-0/+10
| | | | |
* | | | | Merge branch 'gitaly-1182-search-by-content-name' into 'master'Robert Speicher2018-05-181-2/+12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Migrate Repo#search_by_{content,name} to Gitaly See merge request gitlab-org/gitlab-ce!18750
| * | | | Migrate RepositoryService#SearchFilesBy{Content,Name}gitaly-1182-search-by-content-nameKim "BKC" Carlbäcker2018-05-181-2/+12
| | |/ / | |/| |
* | | | Merge branch 'fix/gb/not-allow-to-trigger-skipped-manual-actions' into 'master'Kamil Trzciński2018-05-181-0/+40
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Do not allow to trigger manual actions that were skipped Closes #42589 See merge request gitlab-org/gitlab-ce!18985
| * | | Do not allow to trigger manual actions that were skippedGrzegorz Bizon2018-05-161-0/+40
| | |/ | |/|
* | | Merge branch '46193-fix-big-estimate' into 'master'Rémy Coutable2018-05-171-0/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Estimating a large amount results in a server error 500" Closes #46193 See merge request gitlab-org/gitlab-ce!18964
| * | | Fixes 500 error on /estimate BIG_VALUEJacopo2018-05-171-0/+13
| |/ /
* | | Fix: Use case in-sensitive ordering by name for groupsHarish Ved2018-05-171-0/+108
| | |
* | | Merge branch 'pipelines-index-performance' into 'master'Grzegorz Bizon2018-05-172-4/+107
|\ \ \ | | | | | | | | | | | | | | | | Improve performance of Projects::PipelinesController#index See merge request gitlab-org/gitlab-ce!18427
| * | | Preload pipeline data for project pipelinesYorick Peterse2018-05-172-4/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When displaying the pipelines of a project we now preload the following data: 1. Authors of the commits that belong to these pipelines 2. The number of warnings per pipeline, which is used by Ci::Pipeline#has_warnings? == Commit Authors Previously this data was queried for every Commit separately, leading to 20 SQL queries being executed in the worst case. With an average of 3 to 5 milliseconds per SQL query this could result in 100 milliseconds being spent in _just_ getting Commit authors. To preload this data Commit#author now uses BatchLoader (through Commit#lazy_author), and a separate module Gitlab::Ci::Pipeline::Preloader is used to ensure all authors are loaded before they are used. == Number of warnings This changes Ci::Pipeline#has_warnings? so it supports preloading of the number of warnings per pipeline. This removes the need for executing a COUNT(*) query for every pipeline just to see if it has any warnings or not.
* | | | Merge branch '46177-fix-present-on-generic-commit-status' into 'master'Grzegorz Bizon2018-05-172-0/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "NoMethodError: undefined method `present' for #<GenericCommitStatus:0x00007f6eacf34a40>" Closes #46177 See merge request gitlab-org/gitlab-ce!18979
| * | | Respect the inheritance chain between Ci::Build and CommitStatus46177-fix-present-on-generic-commit-statusMayra Cabrera2018-05-162-5/+8
| | | | | | | | | | | | | | | | Also moves the assertions were they belong
View Lorry Controller Status