summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-redact-links-11-2' into 'security-11-2'Jan Provaznik2018-10-244-0/+42
* Merge branch 'security-if-51113-hash_tokens-11-2' into 'security-11-2'Jan Provaznik2018-10-246-46/+178
* Merge branch 'security-bw-confidential-titles-through-markdown-api-11-2' into...Bob Van Landuyt2018-10-041-1/+1
* Merge branch 'security-fix-leaking-private-project-namespace-11-2' into 'secu...Bob Van Landuyt2018-10-042-12/+20
* Merge branch 'security-package-json-xss-11-2' into 'security-11-2'Bob Van Landuyt2018-09-251-1/+2
* Merge branch 'fix-events-finder-incomplete-11-2' into 'security-11-2'Bob Van Landuyt2018-09-241-3/+17
* Merge branch 'security-11-2-6881-project-group-approvers-leaks-private-group-...Bob Van Landuyt2018-09-243-5/+34
* Merge branch 'osw-fix-missing-and-duplicated-milestones-on-list' into 'master'Sean McGivern2018-08-073-17/+21
|\
| * Fix missing and duplicates on project milestone listing pageOswaldo Ferreira2018-08-073-17/+21
* | Backport issue board milestone lists EE changesOswaldo Ferreira2018-08-071-3/+3
* | Squashed commit of the following:Shinya Maeda2018-08-073-15/+36
* | Resolve "Mutual SSL Auth For Helm TIller"Mayra Cabrera2018-08-076-9/+82
* | Merge branch 'group-todos' into 'master'Sean McGivern2018-08-075-6/+21
|\ \
| * | Add changes from the EEJarka Kadlecová2018-08-061-6/+0
| * | Revert "Revert "Merge branch 'ee-5481-epic-todos' into 'master'""Jarka Kadlecová2018-08-025-6/+27
* | | Merge branch 'osw-fix-n-plus-1-for-mrs-without-merge-info' into 'master'Sean McGivern2018-08-071-11/+17
|\ \ \
| * | | Avoid N+1 on MRs page when metrics merging date cannot be foundOswaldo Ferreira2018-08-061-11/+17
| | |/ | |/|
* | | Send resize parameters for avatarsTim Zallmann2018-08-071-3/+4
* | | Resolve "Improve Auto DevOps settings flow for admin and project"Mike Greiling2018-08-061-0/+4
* | | Merge branch 'sh-support-bitbucket-server-import' into 'master'Tim Zallmann2018-08-061-0/+2
|\ \ \
| * \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-319-34/+97
| |\ \ \
| * \ \ \ Merge commit '45ff4e31094a8b79ed603ae506990b6fa0e7c96e' into sh-support-bitbu...Stan Hu2018-07-281-3/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-2713-68/+148
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-255-2/+76
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-201-0/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-191-1/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-182-6/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-176-11/+17
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add first rev of Bitbucket Server importer testStan Hu2018-07-151-0/+2
* | | | | | | | | | | | Merge branch 'revert-77c75d2b' into 'master'Jose Ivan Vargas2018-08-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert "Merge branch 'bvl-instance-stats-default' into 'master'"revert-77c75d2bBob Van Landuyt2018-08-061-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'background-migrations-system-load' into 'master'Stan Hu2018-08-061-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Respond to DB health in background migrationsYorick Peterse2018-08-061-0/+32
* | | | | | | | | | | | | Merge branch 'issue_44821' into 'master'Sean McGivern2018-08-061-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Retrieve merge request closing issues from database cacheFelipe Artur2018-08-061-3/+18
* | | | | | | | | | | | | Merge branch 'issue_43602' into 'master'Sean McGivern2018-08-061-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Allow multiple JIRA transition idsFelipe Artur2018-08-031-2/+16
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'bvl-instance-stats-default' into 'master'Sean McGivern2018-08-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Hide instance statistics on new installationsBob Van Landuyt2018-08-061-1/+1
* | | | | | | | | | | | | | Merge branch 'jr-archive-hook' into 'master'Nick Thomas2018-08-061-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Use Projects::UpdateService to archive projectsJames Ramsay2018-08-031-8/+0
* | | | | | | | | | | | | | Add group milestones to dashboard milestone pageChantal Rollison2018-08-033-2/+38
* | | | | | | | | | | | | | Merge branch 'artifact-format-v2-with-parser' into 'master'Kamil Trzciński2018-08-034-0/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add factory for parsers. Add required specification in json schema matcher. I...Shinya Maeda2018-08-031-6/+1
| * | | | | | | | | | | | | | Added unique identifier to calculate_reactive_cache. Decoupled comparison log...Shinya Maeda2018-08-032-21/+12
| * | | | | | | | | | | | | | Merge branch 'master-ce' into artifact-format-v2-with-parserShinya Maeda2018-08-03141-16/+319
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Simplify the query to fetch base and head pipelinesShinya Maeda2018-08-021-5/+2
| * | | | | | | | | | | | | | Squashed commit of the following:Shinya Maeda2018-08-024-0/+105
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Resolve "Hashed storage: extend "Enable hashed storage for all new projects" ...Valery Sizov2018-08-031-37/+45
* | | | | | | | | | | | | | Enable frozen string for app/models/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-models-moregfyoung2018-08-0378-0/+156
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |