summaryrefslogtreecommitdiff
path: root/app/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 'issue_38418' into 'master'Rémy Coutable2018-05-241-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix sidebar issue count Closes #38418 See merge request gitlab-org/gitlab-ce!19022
| * | Fix sidebar issue countissue_38418Felipe Artur2018-05-241-2/+2
| | |
* | | Merge branch 'mr-conflict-notification' into 'master'Douwe Maan2018-05-242-5/+26
|\ \ \ | | | | | | | | | | | | | | | | MR unmergeable notification See merge request gitlab-org/gitlab-ce!18042
| * | | Avoid race condition of re-triggering mark_as_uncheckedMark Chao2018-05-181-2/+2
| | | |
| * | | Create TODO when MR became unmergeablelulalala2018-05-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old behavior of creating TODO when “Merge When Pipeline Succeeds” service fails, is generalized to: Create a TODO whenever MR became unmergeable (and similar to notification, MR author and merge_user are both applicable)
| * | | Notify with email when merge request became unmergeablelulalala2018-05-171-0/+4
| | | | | | | | | | | | | | | | Display MR unmergeable reasons
| * | | Add MergeRequest#merge_participantslulalala2018-05-171-0/+10
| | | | | | | | | | | | For notifying via todo or email.
| * | | Add cannot_be_merged_recheck merge_statuslulalala2018-05-172-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | This can occur when a note is added to a commit and then this commit is deleted.
* | | | Use the new CacheableAttributes concern in the ApplicationSetting and ↵Rémy Coutable2018-05-232-46/+5
| | | | | | | | | | | | | | | | | | | | | | | | Appearance models Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Introduce a new CacheableAttributes concernRémy Coutable2018-05-231-0/+54
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Resolve "Deprecate Gemnasium project service"Olivier Gonzalez2018-05-232-1/+13
| | | |
* | | | Merge branch 'dm-xcode-project-directory' into 'master'Robert Speicher2018-05-221-5/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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-5/+15
| | | | |
* | | | | Merge branch ↵Douwe Maan2018-05-221-8/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-8/+19
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'ab-43706-composite-primary-keys' into 'master'Yorick Peterse2018-05-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migration to add primary key constraint for composite keys Closes #43706 and #32258 See merge request gitlab-org/gitlab-ce!18980
| * | | | | Add NOT NULL constraints to project_authorizations.Andreas Brandl2018-05-211-1/+1
| |/ / / / | | | | | | | | | | | | | | | Closes #32258.
* | | | | Expose readme url in Project APIImre Farkas2018-05-221-0/+7
|/ / / /
* | | | Merge branch 'fix/gb/exclude-persisted-variables-from-environment-name' into ↵Grzegorz Bizon2018-05-212-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Do not allow to use `CI_PIPELINE_ID` in environment name Closes #46443 See merge request gitlab-org/gitlab-ce!19032
| * | | | Separate persisted and runtime pipeline variablesGrzegorz Bizon2018-05-182-1/+2
| | | | |
| * | | | Do not allow to use `CI_PIPELINE_ID` in environment nameGrzegorz Bizon2018-05-181-2/+7
| |/ / /
* | | | Merge branch '46082-runner-contacted_at-is-not-always-a-time-type' into 'master'Kamil Trzciński2018-05-212-3/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Runner#contacted_at is not always a Time type" Closes #46082 See merge request gitlab-org/gitlab-ce!18810
| * | | | Revert "Improve cacheable module"46082-runner-contacted_at-is-not-always-a-time-typeMatija Čupić2018-05-181-7/+5
| | | | | | | | | | | | | | | This reverts commit 2ebafdfb2f026580153fd2cf50f4b6b7ab3a0344
| * | | | Improve cacheable moduleKamil Trzciński2018-05-181-5/+7
| | | | |
| * | | | Include class name and argument name in argument errorMatija Čupić2018-05-171-1/+3
| | | | |
| * | | | Use Gitlab.rails5? for checking if on rails5Matija Čupić2018-05-171-3/+3
| | | | |
| * | | | 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/+2
| | | | |
| * | | | Move attribute casting to #cached_attributeMatija Čupić2018-05-161-4/+3
| | | | |
| * | | | Dynamically cast value from cacheMatija Čupić2018-05-152-11/+11
| | | | |
| * | | | Clear memoization after caching new valuesMatija Čupić2018-05-111-0/+2
| | | | |
| * | | | Use symbol instead of string in RedisCacheable attribute definitionsMatija Čupić2018-05-101-2/+2
| | | | |
| * | | | Merge branch 'master' into 46082-runner-contacted_at-is-not-always-a-time-typeMatija Čupić2018-05-093-3/+18
| |\ \ \ \
| * | | | | Move Runner#contacted_at to RedisCacheable#cached_attr_time_readerMatija Čupić2018-05-081-1/+2
| | | | | |
| * | | | | Add cached_attr_time_reader to RedisCacheableMatija Čupić2018-05-081-0/+9
| | | | | |
* | | | | | 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
* | | | | | | Rescue Kubeclient::HttpError when generating prometheus_clientShinya Maeda2018-05-211-0/+5
|/ / / / / /
* | | | | | Merge branch 'fix/gb/not-allow-to-trigger-skipped-manual-actions' into 'master'Kamil Trzciński2018-05-181-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | |
* | | | | | Merge branch '46193-fix-big-estimate' into 'master'Rémy Coutable2018-05-171-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+4
| | |_|_|/ / | |/| | | |
* | | | | | Fix: Use case in-sensitive ordering by name for groupsHarish Ved2018-05-171-2/+2
| | | | | |
* | | | | | Merge branch '6020-extract-ee-specific-controller-lines' into 'master'Robert Speicher2018-05-171-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Resolve "Extract EE specific files/lines for some controllers" See merge request gitlab-org/gitlab-ce!18994
| * | | | | | Backport changes from EE to minimize the CE/EE diff in ↵6020-extract-ee-specific-controller-linesRémy Coutable2018-05-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects::Settings::IntegrationsController Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status