summaryrefslogtreecommitdiff
path: root/app/models/concerns
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
* | 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-015-6/+6
|\ \ \ | |/ / |/| |
| * | Fix typos in comments and specsGeorge Tsiolis2018-11-015-6/+6
* | | Merge branch 'remove-ee-specific-code-from-plan-and-create-models' into 'master'Douglas Barbosa Alexandre2018-10-311-1/+1
|\ \ \
| * | | Remove EE-specific code from DiscussionNoteremove-ee-specific-code-from-plan-and-create-modelsSean McGivern2018-10-261-1/+1
* | | | Allow FoundBlob to access language from gitattributesMark Chao2018-10-301-0/+13
| |/ / |/| |
* | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-291-0/+1
|\ \ \
| * | | Associate clusters model to groups34758-create-group-clustersThong Kuah2018-10-291-0/+1
| |/ /
* | | Merge branch 'security-redact-links' into 'master'Jan Provaznik2018-10-292-0/+36
|\ \ \ | |_|/ |/| |
| * | Redact unsubscribe links in issuable textsJan Provaznik2018-10-232-0/+36
| |/
* | [master] Persist only SHA digest of PersonalAccessToken#tokenImre Farkas2018-10-294-31/+166
|/
* Add preload in issues controllerChantal Rollison2018-10-181-31/+48
* Remove dependencies on LinguistZeger-Jan van de Weg2018-10-121-1/+1
* Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-052-0/+82
|\
| * Merge branch 'ce-issue_1984' into 'master'Sean McGivern2018-10-051-0/+81
| |\
| | * Backport CE changes from draft_notes addition in EEMario de la Ossa2018-10-041-0/+81
| * | Merge branch '51748-filter-any-milestone-via-api' into 'master'Douwe Maan2018-10-051-0/+1
| |\ \
| | * | Allows to filter issues by `Any milestone` in the APIJacopo2018-10-031-0/+1
| | |/
* | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-051-3/+5
|\ \ \ | |/ /
| * | Fix N+1 for notification recipients in subscribersSean McGivern2018-10-041-3/+5
| |/
* | Change the order of status_sql to avoid the query for scheduled status at the...Shinya Maeda2018-10-021-1/+1
* | Optimize query formatShinya Maeda2018-10-021-1/+1
* | Fix spec. Create scheduled status entry for pipelineShinya Maeda2018-10-021-1/+1
* | Update pipelines and stages status as wellShinya Maeda2018-10-021-0/+2
* | Add a new status to ci_builds.statusShinya Maeda2018-10-021-7/+9
* | Squashed commit of the following:Shinya Maeda2018-10-021-1/+2
|/
* Improve logging when username update fails due to registry tagsStan Hu2018-10-021-2/+4
* Use `Gitlab::SafeRequestStore` in more placesMichael Kozono2018-09-241-3/+3
* Simplify by using Gitlab::SafeRequestStoreMichael Kozono2018-09-241-5/+1
* Merge branch 'remove-ee-specific-lines-from-plan-concerns' into 'master'Robert Speicher2018-09-183-13/+30
|\
| * Fix bad conflicts resolutionLin Jen-Shin2018-09-171-2/+2
| * Remove EE-specific code from ProtectedRefAccessSean McGivern2018-09-171-7/+11
| * Remove EE-specific code from MentionableSean McGivern2018-09-172-6/+19
| * Remove EE-specific code from IssuableSean McGivern2018-09-171-2/+2
* | Added FromUnion to easily select from a UNIONYorick Peterse2018-09-171-0/+51
|/
* Merge branch '50824-fix-prepend-concern' into 'master'Robert Speicher2018-09-142-8/+6
|\
| * Fix how we use EE::ProtectedRefAccessLin Jen-Shin2018-09-112-8/+6
* | Enable frozen string in vestigial filesgfyoung2018-09-111-0/+2
|/
* Merge branch '48778-remove-old-storage-logic-from-import-export' into 'master'Douwe Maan2018-09-071-4/+0
|\
| * Refactor code to remove object storage flag from Import/ExportJames Lopez2018-09-061-4/+0
* | Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-072-4/+19
* | Merge branch 'issue_50488' into 'master'Stan Hu2018-09-071-0/+26
|\ \
| * | Move project services log to a separate fileFelipe Artur2018-09-061-0/+26
| |/
* | Resolve "Migrate issue labels and milestone to related merge request"Tiago Botelho2018-09-061-1/+1
* | Merge branch 'bvl-codeowners-file-ce' into 'master'Douwe Maan2018-09-061-11/+34
|\ \ | |/ |/|
| * Port changes for CODEOWNERS to CEBob Van Landuyt2018-09-061-11/+34
View Lorry Controller Status