summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | fixing MR issues with importJames Lopez2016-03-111-1/+3
* | | | | | | | | | | | | | Merge branch 'make-sure-that-artifacts-file-is-saved' into 'master' Rémy Coutable2016-06-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Make sure that artifacts_file is nullified after removing artifactsmake-sure-that-artifacts-file-is-savedKamil Trzcinski2016-06-171-0/+1
* | | | | | | | | | | | | | | Merge branch '2979-personal-access-tokens' into 'master' Douwe Maan2016-06-172-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-1622-139/+322
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Implement @DouweM's feedback.Timothy Andrew2016-06-161-0/+5
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-148-51/+116
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-0920-142/+297
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-0337-433/+862
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-05-1182-1523/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Address @DouweM's feedback on !3749.Timothy Andrew2016-04-281-1/+4
| * | | | | | | | | | | | | | | | | | Make fixes based on @vsizov's comments on MR !3749Timothy Andrew2016-04-281-2/+2
| * | | | | | | | | | | | | | | | | | Add an "Inactive Personal Access Tokens" section.Timothy Andrew2016-04-281-1/+2
| * | | | | | | | | | | | | | | | | | Allow expiration of personal access tokens.Timothy Andrew2016-04-281-1/+1
| * | | | | | | | | | | | | | | | | | Allow revoking personal access tokens.Timothy Andrew2016-04-281-0/+7
| * | | | | | | | | | | | | | | | | | Allow creating Personal Access Tokens through the website.Timothy Andrew2016-04-282-0/+10
* | | | | | | | | | | | | | | | | | | Merge branch '18709-use-specific-git-cached-counters' into 'master' Yorick Peterse2016-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Use Git cached counters on project show page18709-use-specific-git-cached-countersPaco Guzman2016-06-161-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \