summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | Allow to expire build artifactsKamil Trzcinski2016-06-131-2/+16
| | |_|_|/ | |/| | |
* | | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-148-48/+41
* | | | | Factorize members mails into a new Emails::Members moduleRémy Coutable2016-06-141-0/+4
* | | | | Add request access for groupsRémy Coutable2016-06-149-91/+86
* | | | | Initial implementation of user access request to projectsDavid Alexander2016-06-144-6/+80
| |_|/ / |/| | |
* | | | Merge branch 'confidential-issues-in-private-projects' into 'master' Douwe Maan2016-06-145-28/+37
|\ \ \ \
| * | | | Use Issue.visible_to_user in Notes.search to avoid query duplicationDouglas Barbosa Alexandre2016-06-133-30/+14
| * | | | Project members with guest role can't access confidential issuesDouglas Barbosa Alexandre2016-06-135-12/+37
| | |_|/ | |/| |
* | | | Fix broken URI joining for `teamcity_url` with suffixesRémy Coutable2016-06-141-18/+19
* | | | Factorize duplicated code into a method in BambooService and update specsRémy Coutable2016-06-141-20/+17
* | | | Fix broken URI joining for `bamboo_url` with suffixesBenjamin Schmid2016-06-141-4/+4
* | | | Honor credentials on calling Bamboo CI triggerBenjamin Schmid2016-06-141-4/+13
|/ / /
* | | Remove deprecated issues_tracker and issues_tracker_id from projectDouglas Barbosa Alexandre2016-06-132-20/+3
| |/ |/|
* | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-132-9/+13
|\ \ | |/ |/|
| * Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-101-3/+6
| * Remove notification level from user modelFelipe Artur2016-06-102-9/+10
* | Merge branch 'finding-multiple-projects-by-paths' into 'master' Robert Speicher2016-06-101-11/+60
|\ \
| * | Add Project.where_paths_infinding-multiple-projects-by-pathsYorick Peterse2016-06-101-11/+60
View Lorry Controller Status