summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ce-jej/group-saml-discovery-token' into 'master'Kamil Trzciński2018-11-022-3/+10
|\
| * TokenAuthenticatable allows non-unique tokensce-jej/group-saml-discovery-tokenJames Edwards-Jones2018-10-312-3/+10
* | Remove ci_enable_scheduled_build feature flagShinya Maeda2018-11-021-2/+1
* | Use a method for the has_many :keys in Projectuser-model-merge-conflictsYorick Peterse2018-11-012-1/+5
* | Move LDAP sync time constant to a methodYorick Peterse2018-11-011-1/+6
* | Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'Sean McGivern2018-11-011-2/+16
|\ \
| * | Fix testsHeinrich Lee Yu2018-11-011-16/+2
| * | Add None / Any options to reaction filter in issues / MRs APIHeinrich Lee Yu2018-11-011-0/+28
* | | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-019-11/+11
|\ \ \
| * | | Fix typos in comments and specsGeorge Tsiolis2018-11-019-11/+11
* | | | Merge branch 'sh-optimize-merge-request-project-lookup' into 'master'Sean McGivern2018-11-011-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Reduce SQL queries needed to load open merge requestssh-optimize-merge-request-project-lookupStan Hu2018-10-301-1/+1
* | | | Merge branch 'remove-ee-specific-code-from-plan-and-create-models' into 'master'Douglas Barbosa Alexandre2018-10-313-5/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Remove EE-specific code from DiscussionNoteremove-ee-specific-code-from-plan-and-create-modelsSean McGivern2018-10-263-5/+9
* | | | Merge branch 'add-language-param-to-highlight' into 'master'Douwe Maan2018-10-302-7/+17
|\ \ \ \
| * | | | Allow FoundBlob to access language from gitattributesMark Chao2018-10-302-7/+14
| * | | | Move :plain option to Highlight classMark Chao2018-10-301-6/+0
| * | | | Add BlobPresenter for highlightingMark Chao2018-10-301-1/+3
| * | | | Add access to Blob's language from gitattributesMark Chao2018-10-301-0/+7
| | |/ / | |/| |
* | | | Merge branch 'tc-index-lfs-objects-file-store' into 'master'Douglas Barbosa Alexandre2018-10-301-2/+2
|\ \ \ \
| * | | | Enhance performance of counting local LFS objectstc-index-lfs-objects-file-storeToon Claes2018-10-301-2/+2
| |/ / /
* | | | Renaming Secret Variables in the codebaseMarcel Amirault2018-10-303-4/+4
|/ / /
* | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-2915-55/+289
|\ \ \
| * \ \ Merge branch 'rails5-deprecated-uniq' into 'master'Robert Speicher2018-10-292-2/+2
| |\ \ \
| | * | | Replace deprecated uniq on a Relation with distinctJasper Maes2018-10-262-2/+2
| * | | | post merge pipeline and environments statusAlessio Caiazza2018-10-293-6/+45
| * | | | Merge branch '34758-create-group-clusters' into 'master'Andreas Brandl2018-10-294-0/+42
| |\ \ \ \
| | * | | | Associate clusters model to groups34758-create-group-clustersThong Kuah2018-10-294-0/+42
| * | | | | Merge branch 'rz_fix_milestone_count' into 'master'Sean McGivern2018-10-292-44/+16
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Moving state_count to Milestone model and related testsEagllus2018-10-172-60/+16
| | * | | | Fixing count on MilestonesRonald van Zon2018-10-041-2/+18
| * | | | | Add failure reason for execution timeoutShinya Maeda2018-10-281-1/+2
| | |/ / / | |/| | |
| * | | | Resolve "No longer require a deploy to start Prometheus monitoring"Peter Leitzen2018-10-261-1/+1
| | |/ / | |/| |
| * | | Automatically navigate to last board visitedBrett Walker2018-10-262-0/+50
| * | | Support backward compatibility when introduce new failure reasonShinya Maeda2018-10-261-1/+1
| * | | Merge branch '49565-ssh-push-mirroring' into 'master'Robert Speicher2018-10-251-0/+130
| |\ \ \
| | * | | Backport SSH host key detection code to CENick Thomas2018-10-251-0/+130
* | | | | Merge branch 'fix_pat_auth-11-4' into 'security-11-4'Robert Speicher2018-10-291-1/+1
* | | | | Merge branch 'security-redact-links' into 'master'Jan Provaznik2018-10-294-0/+42
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Redact unsubscribe links in issuable textsJan Provaznik2018-10-234-0/+42
* | | | | [master] Persist only SHA digest of PersonalAccessToken#tokenImre Farkas2018-10-296-46/+178
| |/ / / |/| | |
* | | | Merge branch 'refactor_gitlab_kube_client' into 'master'Kamil Trzciński2018-10-252-8/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Store version within SUPPORTED_API_GROUPS hashrefactor_gitlab_kube_clientThong Kuah2018-10-232-4/+2
| * | | Update all usages of KubeClientThong Kuah2018-10-232-6/+4
| |/ /
* | | Update Runner Chart to 0.1.35Tomasz Maczukin2018-10-231-1/+1
* | | Merge branch 'support-license-management-and-performance' into 'master'Grzegorz Bizon2018-10-231-3/+9
|\ \ \
| * | | Support licenses and performancesupport-license-management-and-performanceKamil Trzciński2018-10-221-3/+9
* | | | Merge branch 'lfs-project-attribute-alias' into 'master'Nick Thomas2018-10-231-0/+2
|\ \ \ \
| * | | | Alias the lfs_enabled methodlfs-project-attribute-aliasCindy Pallares2018-10-221-0/+2
* | | | | Resolve "Filter discussion (tab) by comments or activity in issues and merge ...Oswaldo Ferreira2018-10-233-0/+69