summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '45190-create-notes-diff-files' into 'master'Douwe Maan2018-05-285-22/+72
|\
| * Persist truncated note diffs on a new table45190-create-notes-diff-filesOswaldo Ferreira2018-05-245-22/+72
* | Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master'Rémy Coutable2018-05-251-1/+1
|\ \
| * | Replace Gitlab::REVISION with Gitlab.revision and handle installations withou...46600-fix-gitlab-revision-when-not-in-git-repoRémy Coutable2018-05-241-1/+1
| |/
* | Merge branch 'issue_38418' into 'master'Rémy Coutable2018-05-241-2/+2
|\ \
| * | Fix sidebar issue countissue_38418Felipe Artur2018-05-241-2/+2
* | | Merge branch 'mr-conflict-notification' into 'master'Douwe Maan2018-05-242-5/+26
|\ \ \
| * | | Avoid race condition of re-triggering mark_as_uncheckedMark Chao2018-05-181-2/+2
| * | | Create TODO when MR became unmergeablelulalala2018-05-171-0/+1
| * | | Notify with email when merge request became unmergeablelulalala2018-05-171-0/+4
| * | | Add MergeRequest#merge_participantslulalala2018-05-171-0/+10
| * | | Add cannot_be_merged_recheck merge_statuslulalala2018-05-172-5/+11
* | | | Merge branch 'jprovazn-fix-resolvable' into 'master'Douwe Maan2018-05-241-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Check if note's noteable is not nil when checking resolvabilityjprovazn-fix-resolvableJan Provaznik2018-05-231-1/+1
* | | | Use the new CacheableAttributes concern in the ApplicationSetting and Appeara...Rémy Coutable2018-05-232-46/+5
* | | | Introduce a new CacheableAttributes concernRémy Coutable2018-05-231-0/+54
* | | | 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 filesdm-xcode-project-directoryDouwe Maan2018-05-221-5/+15
* | | | | Merge branch '22846-notifications-broken-during-email-address-change-before-e...Douwe Maan2018-05-221-8/+19
|\ \ \ \ \
| * | | | | 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
| | |/ / / | |/| | |
* | | | | Merge branch 'ab-43706-composite-primary-keys' into 'master'Yorick Peterse2018-05-221-1/+1
|\ \ \ \ \
| * | | | | Add NOT NULL constraints to project_authorizations.Andreas Brandl2018-05-211-1/+1
| |/ / / /
* | | | | 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
|\ \ \ \
| * | | | 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
|\ \ \ \
| * | | | Revert "Improve cacheable module"46082-runner-contacted_at-is-not-always-a-time-typeMatija Čupić2018-05-181-7/+5
| * | | | 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
| * | | | 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
|\ \ \ \ \ \
| * | | | | | Fixes deploy tokens build variables46454-wrong-value-in-ci-deploy-userMayra Cabrera2018-05-181-1/+1
* | | | | | | 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 skippedGrzegorz Bizon2018-05-161-1/+1
* | | | | | Merge branch '46193-fix-big-estimate' into 'master'Rémy Coutable2018-05-171-0/+4
|\ \ \ \ \ \
| * | | | | | 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
View Lorry Controller Status