summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1218-145/+239
|\
| * Merge branch 'fix-namespace-deletion' into 'master' Robert Speicher2016-08-121-0/+2
| |\
| | * Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-111-0/+2
| * | Merge branch 'improve-pipeline-processing' into 'master' Rémy Coutable2016-08-123-43/+89
| |\ \
| | * | Improve transition between states for event `enqueue`Kamil Trzcinski2016-08-121-1/+1
| | * | Use event `enqueue` instead of `queue`Kamil Trzcinski2016-08-123-16/+10
| | * | Fix test failuresKamil Trzcinski2016-08-121-1/+1
| | * | Added specs for started_at and finished_atKamil Trzcinski2016-08-121-7/+8
| | * | Use explicit events to transition between statesKamil Trzcinski2016-08-122-13/+33
| | * | Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-121-0/+1
| | |\ \ | | | |/
| | * | Fix test failures, that did occur because of missing previously used `reload_...Kamil Trzcinski2016-08-112-28/+27
| | * | Use state machine for pipeline event processingKamil Trzcinski2016-08-112-22/+47
| | * | Verify the pipeline status after executing events on buildsKamil Trzcinski2016-08-112-1/+8
| * | | Merge branch 'remove-unused-spam-report' into 'master' Robert Speicher2016-08-111-5/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Remove unused SpamReport model; this was renamed to SpamLogremove-unused-spam-reportStan Hu2016-08-111-5/+0
| * | | api for generating new merge requestScott Le2016-08-111-0/+1
| | |/ | |/|
| * | Merge branch 'refactor-builds-creation-service' into 'master' Rémy Coutable2016-08-114-86/+72
| |\ \
| | * | Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-114-86/+72
| | |/
| * | Merge branch '18583-implement-access-request-to-project-group-api' into 'mast...Rémy Coutable2016-08-112-0/+5
| |\ \
| | * | New AccessRequests API endpoints for Group & ProjectRémy Coutable2016-08-102-0/+5
| | |/
| * | Merge branch '13333-consider-updating-http-parser-rb-to-0-6-0' into 'master' Rémy Coutable2016-08-111-7/+44
| |\ \ | | |/ | |/|
| | * Replace the tinder gem by bare HTTP requestsThomas Balthazar2016-08-111-7/+44
| * | Merge branch 'decouple-secret-keys' into 'master' Douwe Maan2016-08-101-2/+2
| |\ \
| | * | Store OTP secret key in secrets.ymlSean McGivern2016-08-031-2/+2
| * | | Clean up project destructionclean-up-project-destroyStan Hu2016-08-101-10/+0
| * | | Add a method in Project to return a cached value of total count of projectsStan Hu2016-08-091-0/+6
| | |/ | |/|
| * | Update version_sorter and use new interface for faster tag sortingAlejandro Rodríguez2016-08-081-3/+1
| * | Merge branch 'rubocop/SpaceAroundEqualsInParameterDefault' into 'master' Douwe Maan2016-08-082-2/+2
| |\ \
| | * | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-062-2/+2
| * | | Merge branch 'faster-cache-keys' into 'master' Rémy Coutable2016-08-083-0/+18
| |\ \ \
| | * | | Added concern for a faster "cache_key" methodfaster-cache-keysYorick Peterse2016-08-083-0/+18
| | |/ /
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-08-081-0/+4
| |\ \ \ | | |/ /
| | * | Move abilities by subject class to a dedicated method20621-avoid-lame-conflicts-in-ability-allowedRémy Coutable2016-08-041-0/+4
| * | | Merge branch '14898-protected-branches-developer-can-not-push-without-permiss...Douwe Maan2016-08-051-0/+11
| |\ \ \ | | |/ / | |/| |
| | * | changes default_branch_protection to allow devs_can_merge protection option a...tiagonbotelho2016-08-041-9/+4
| | * | developer cannot push to protected branch when project is empty or he has not...tiagonbotelho2016-08-021-0/+16
| * | | Merge branch '20512-fix-rename-add-users-into-project-to-add-users-to-project...Rémy Coutable2016-08-042-4/+4
| |\ \ \
| | * | | Fix Rename `add_users_into_project` and `projects_ids`Herminio Torres2016-08-042-4/+4
| * | | | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-041-5/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-041-5/+0
| | |/ /
* | | | Add specs for NotesController and DiscussionsControllerDouwe Maan2016-08-121-0/+4
* | | | Add specs for Discussion and MergeRequest modelsDouwe Maan2016-08-121-3/+5
* | | | Add specs for new Note and DiffNote methods.Douwe Maan2016-08-121-0/+3
* | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-0320-70/+329
|\ \ \ \ | |/ / /
| * | | change the API on the merge_request_diff model from diffs -> raw_diffsuse-raw-diffs-for-merge-request-diffsPaco Guzman2016-08-032-6/+6
| * | | Use only deltas in diffs when scanning the last commit for changes in the ava...Stan Hu2016-08-031-1/+1
| * | | Speed up Commit#repo_changesAhmad Sherif2016-08-031-1/+1
| * | | Make Compare#diffs diff_options a regular argumentDouwe Maan2016-08-032-2/+2
| * | | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-035-28/+32
| * | | Introduce Compare model in the codebase.Paco Guzman2016-08-033-5/+52