summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'remove_jiraissue' into 'master' Robert Speicher2016-06-171-2/+0
|\
| * Remove JiraIssue model and replace references with ExternalIssueIlan Shamir2016-06-161-2/+0
* | Merge branch 'fix-project-find-with-namespace-order' into 'master' Robert Speicher2016-06-171-1/+17
|\ \
| * | Fixed ordering in Project.find_with_namespacefix-project-find-with-namespace-orderYorick Peterse2016-06-161-1/+17
* | | Merge branch 'fix/status-of-pipeline-without-builds' into 'master' Rémy Coutable2016-06-161-15/+23
|\ \ \
| * \ \ Merge branch 'master' into fix/status-of-pipeline-without-buildsfix/status-of-pipeline-without-buildsGrzegorz Bizon2016-06-1519-74/+241
| |\ \ \
| * | | | Remove reduntant method for building pipeline buildsGrzegorz Bizon2016-06-151-7/+5
| * | | | Improve creating builds by combining two loopsGrzegorz Bizon2016-06-151-20/+16
| * | | | Add note for short circuit eval when building buildsGrzegorz Bizon2016-06-151-2/+12
| * | | | Return false in create_builds if not builds createdGrzegorz Bizon2016-06-151-3/+2
| * | | | Improve code clarity in pipeline create serviceGrzegorz Bizon2016-06-141-1/+1
| * | | | Merge branch 'master' into fix/status-of-pipeline-without-buildsGrzegorz Bizon2016-06-1426-261/+497
| |\ \ \ \
| * | | | | Refactor code reponsible for creating buildsGrzegorz Bizon2016-06-032-8/+16
| * | | | | Save Ci::Commit object to persist all created buildsKamil Trzcinski2016-06-032-3/+8
| * | | | | Add minor improvements in create builds serviceGrzegorz Bizon2016-06-031-1/+1
| * | | | | Refactor ci commit pipeline to prevent implicit savesGrzegorz Bizon2016-06-031-12/+4
* | | | | | Merge branch 'group-owners-association' into 'master' Rémy Coutable2016-06-161-4/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Turn Group#owners into a has_many associationYorick Peterse2016-06-161-4/+6
* | | | | | Set inverse_of for Project/Services relationYorick Peterse2016-06-152-2/+2
| |_|_|/ / |/| | | |
* | | | | Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-152-2/+2
|\ \ \ \ \
| * | | | | Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-122-2/+2
* | | | | | Merge branch 'zj-system-notes-not-awardable' into 'master' Douwe Maan2016-06-151-0/+4
|\ \ \ \ \ \
| * | | | | | Award Emoji can't be awarded on system notes backendzj-system-notes-not-awardableZ.J. van de Weg2016-06-151-0/+4
* | | | | | | Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-156-13/+80
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Use validate and required for environment and projectKamil Trzcinski2016-06-152-3/+3
| * | | | | | Validate project and environment instead of only requiringKamil Trzcinski2016-06-151-2/+2
| * | | | | | Create_deployment ability is need to create retry or rollback deploymentKamil Trzcinski2016-06-151-2/+2
| * | | | | | Improve cyclomatic of ability::allowedKamil Trzcinski2016-06-151-15/+1
| * | | | | | Improve forms and specsKamil Trzcinski2016-06-151-2/+2
| * | | | | | Improve validationsKamil Trzcinski2016-06-152-7/+3
| * | | | | | Improve design after reviewKamil Trzcinski2016-06-144-12/+22
| * | | | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-141-4/+29
| |\ \ \ \ \ \
| * | | | | | | Test environment controller specsKamil Trzcinski2016-06-141-0/+4
| * | | | | | | Properly create a new deployment after build successKamil Trzcinski2016-06-141-2/+6
| * | | | | | | Add specs for models and servicesKamil Trzcinski2016-06-142-0/+6
| * | | | | | | Validate environment name with regexKamil Trzcinski2016-06-141-1/+5
| * | | | | | | Make retry action on pipeline to save a userKamil Trzcinski2016-06-141-2/+4
| * | | | | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-1410-94/+97
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Added initial version of deploymentsKamil Trzcinski2016-06-105-6/+57
| * | | | | | | commit statusKamil Trzcinski2016-06-101-0/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Include user relationship when retrieving award_emoji14320-note-grouped_awardsPaco Guzman2016-06-151-2/+6
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-141-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Manually create todo for issuablePhil Hughes2016-06-141-0/+1
* | | | | | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-141-4/+29
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-149-85/+84
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-132-9/+13
| |\ \ \ \ \
| * | | | | | Improve design based on reviewKamil Trzcinski2016-06-131-5/+4
| * | | | | | Show the artifacts expiration prompt in Build Artifacts widgetKamil Trzcinski2016-06-131-2/+2
| * | | | | | Add artifacts_expire_in method for Ci::BuildKamil Trzcinski2016-06-131-0/+12
| * | | | | | Move keep to ArtifactsControllerKamil Trzcinski2016-06-131-4/+4
View Lorry Controller Status