summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-annotated-tags-pointing-to-blob' into 'master' Douwe Maan2017-01-271-0/+24
|\
| * Fix Error 500 when repositories contain annotated tags pointing to blobssh-fix-annotated-tags-pointing-to-blobStan Hu2017-01-261-0/+24
* | Use `:empty_project` where possible in model specsrs-empty_project-modelsRobert Speicher2017-01-2663-141/+143
* | Merge branch 'rs-empty_project-for-associations' into 'master' Rémy Coutable2017-01-262-2/+2
|\ \ | |/ |/|
| * Use a project factory with a repository where necessaryrs-empty_project-for-associationsRobert Speicher2017-01-252-2/+2
* | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon2017-01-252-2/+50
|\ \
| * \ Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui...Kamil Trzcinski2017-01-246-45/+192
| |\ \
| * | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_...Kamil Trzcinski2017-01-202-2/+50
* | | | Merge branch 'dz-fix-group-canonical-route' into 'master' Dmitriy Zaporozhets2017-01-251-0/+6
|\ \ \ \
| * | | | Fix 500 error for Group#web_url method if nested groupdz-fix-group-canonical-routeDmitriy Zaporozhets2017-01-241-0/+6
* | | | | Merge branch 'dz-nested-groups-access-improvements' into 'master' Dmitriy Zaporozhets2017-01-254-7/+66
|\ \ \ \ \
| * | | | | Add User#nested_groups and User#nested_projects methodsDmitriy Zaporozhets2017-01-252-0/+43
| * | | | | Refactor Namespace code related to nested groupsDmitriy Zaporozhets2017-01-132-7/+23
* | | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-253-3/+129
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | address commentsJarka Kadlecova2017-01-253-22/+82
| * | | | | make mentions working when project not specifiedJarka Kadlecova2017-01-182-1/+14
| * | | | | Support notes without projectJarka Kadlecova2017-01-183-0/+53
* | | | | | Merge branch '26468-fix-users-sort-in-admin-area' into 'master' Douwe Maan2017-01-241-17/+30
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixing sort of Users so that users who never logged in will be displayed lastPoornima M2017-01-241-17/+30
| | |_|/ / | |/| | |
* | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast...Sean McGivern2017-01-241-0/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allows to search within project by commit's hashYarNayar2017-01-241-0/+18
* | | | | Merge branch 'fix/rename-group-export-vuln' into 'security' Robert Speicher2017-01-231-2/+9
* | | | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' Kamil Trzciński2017-01-233-39/+142
|\ \ \ \ \
| * | | | | Fix warnings argument memoization in CI/CD stagefeature/success-warning-icons-in-stages-buildsGrzegorz Bizon2017-01-191-5/+19
| * | | | | Add a default status const to common status concernGrzegorz Bizon2017-01-181-0/+6
| * | | | | Improve readability of specs for pipeline stagesGrzegorz Bizon2017-01-181-39/+64
| * | | | | Pass memoizable warnings attribute to stage objectGrzegorz Bizon2017-01-181-5/+15
| * | | | | Add specs for two new methods defined in stage classGrzegorz Bizon2017-01-111-0/+48
* | | | | | Merge branch 'record-used-ssh-keys-once-per-day' into 'master' Yorick Peterse2017-01-201-4/+23
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Record used SSH keys only once per dayrecord-used-ssh-keys-once-per-dayAdam Niedzielski2017-01-201-4/+23
* | | | | | Merge branch 'rs-empty_project' into 'master' 26785-search-bar-doesnt-work-IERémy Coutable2017-01-203-121/+115
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Convert most MergeRequest model specs to use `:empty_project`Robert Speicher2017-01-191-22/+22
| * | | | | Convert most User model specs to use `:empty_project`Robert Speicher2017-01-191-45/+39
| * | | | | Convert most Project model specs to use `:empty_project`Robert Speicher2017-01-191-54/+54
| | |/ / / | |/| | |
* | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-194-5/+81
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'wip-mr-from-commits' into 'master' Sean McGivern2017-01-191-0/+28
| |\ \ \ \
| | * | | | Mark MR as WIP when pushing WIP commitsjurre2017-01-191-0/+28
| * | | | | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-191-0/+15
| |\ \ \ \ \
| | * | | | | More improvements to presenters23563-document-presentersRémy Coutable2017-01-181-2/+2
| | * | | | | Add Presentable concernRémy Coutable2017-01-181-0/+15
| * | | | | | Merge branch 'fix/external-status-badge-links' into 'master' Kamil Trzciński2017-01-191-4/+29
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Add URL validations for generic commit statusesGrzegorz Bizon2017-01-181-0/+7
| | * | | | | Add specs for a new external build detailed statusGrzegorz Bizon2017-01-171-4/+22
| * | | | | | Merge branch '23524-notify-automerge-user-of-failed-build' into 'master' Sean McGivern2017-01-191-1/+9
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Notify the user who set auto-merge when merge conflict occurstwonegatives2017-01-141-1/+9
* | | | | | | Fix specsKamil Trzcinski2017-01-191-5/+28
* | | | | | | Add missing build_specKamil Trzcinski2017-01-191-0/+10
* | | | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-1958-2107/+3452
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' Douwe Maan2017-01-188-87/+28
| |\ \ \ \ \ \
| | * | | | | | refactor fetcher and fixed specsJames Lopez2017-01-177-20/+20