summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '33933-fix-deployment-indicator-date' into 'master'Robert Speicher2017-06-261-1/+1
|\
| * Fix bug where Service `created_at` time was used instead of deployment time.33933-fix-deployment-indicator-datePawel Chojnacki2017-06-221-1/+1
* | Merge branch 'feature/add-new-services' into 'master'Sean McGivern2017-06-261-7/+6
|\ \
| * | fix spec failuresJames Lopez2017-06-251-2/+2
| * | refactor update user service not to do auth checksJames Lopez2017-06-231-3/+3
| * | refactor emails serviceJames Lopez2017-06-231-2/+0
| * | add missing user updatesJames Lopez2017-06-231-3/+4
| * | update missing email actionsJames Lopez2017-06-231-1/+1
| * | update to use emails destroy serviceJames Lopez2017-06-231-1/+1
| |/
* | Merge branch 'fix/gb/fix-skipped-pipeline-with-allowed-to-fail-jobs' into 'ma...Kamil Trzciński2017-06-261-10/+13
|\ \
| * | Check warnings when building compound status SQL queryGrzegorz Bizon2017-06-202-16/+13
| * | Move custom compound status method to commit statusGrzegorz Bizon2017-06-202-3/+7
| * | Fix pipeline status when allowed to fail jobs presentGrzegorz Bizon2017-06-201-1/+3
* | | Merge branch 'fix-34019' into 'master'Sean McGivern2017-06-261-1/+16
|\ \ \
| * | | Check if repository exists before performing housekeepingfix-34019Douglas Barbosa Alexandre2017-06-231-0/+2
| * | | Break Project#perform_housekeeping in two methodsDouglas Barbosa Alexandre2017-06-231-4/+12
| * | | Perform project housekeeping after importing projectsDouglas Barbosa Alexandre2017-06-231-3/+8
| | |/ | |/|
* | | Add User#full_private_access? to check if user has Private accesstc-refactor-projects-finder-init-collectionToon Claes2017-06-232-1/+7
|/ /
* | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branchPawel Chojnacki2017-06-2239-265/+310
|\ \
| * \ Merge branch 'bvl-validate-path-update' into 'master'Douwe Maan2017-06-211-8/+8
| |\ \
| | * | Rebuild the dynamic path before validating itbvl-validate-path-updateBob Van Landuyt2017-06-211-8/+8
| * | | Merge branch '34008-fix-CI_ENVIRONMENT_URL-2' into 'master'Kamil Trzciński2017-06-211-16/+11
| |\ \ \
| | * | | Expand with all the variables so that things likeLin Jen-Shin2017-06-211-8/+4
| | * | | Move expanded_environment_url to CreateDeploymentServiceLin Jen-Shin2017-06-211-21/+9
| | * | | Add comments to explain some culprit; Add changelogLin Jen-Shin2017-06-211-2/+9
| | * | | Don't expand CI_ENVIRONMENT_URL so runner would doLin Jen-Shin2017-06-211-4/+8
| | |/ /
| * | | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-2128-165/+165
| |/ /
| * | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-202-7/+43
| |\ \
| | * | Refactor GroupProjectsFinder#init_collectionYorick Peterse2017-06-191-0/+17
| | * | Refactor Project.with_feature_available_for_userYorick Peterse2017-06-162-7/+26
| * | | Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-202-3/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Remove backticks from chat messages because they're not rendered as codedm-chat-message-backticksDouwe Maan2017-06-192-3/+3
| * | | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-191-1/+1
| |\ \ \
| | * | | Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-191-1/+1
| | |/ /
| * | | Merge branch '30725-reset-user-limits-when-unchecking-external-user' into 'ma...Douwe Maan2017-06-191-13/+16
| |\ \ \ | | |/ / | |/| |
| | * | refactors user model validations30725-reset-user-limits-when-unchecking-external-userTiago Botelho2017-06-191-9/+9
| | * | Ensures default user limits when external user is uncheckedTiago Botelho2017-06-161-6/+9
| * | | Add table for files in merge request diffsSean McGivern2017-06-162-17/+48
| * | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-165-7/+7
| |\ \ \
| | * | | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-155-7/+7
| | |/ /
| * | | Improve method names and add more specsFelipe Artur2017-06-164-13/+15
| * | | Migration - Remove position field from issues and merge requestsFelipe Artur2017-06-162-0/+6
| * | | Remove old specs and add new onesFelipe Artur2017-06-161-2/+6
| * | | Order merge requests by priorityFelipe Artur2017-06-164-6/+6
| * | | Order issues by priorityFelipe Artur2017-06-162-6/+8
| * | | Remove Drag and drop and sorting from milestone viewFelipe Artur2017-06-162-34/+0
| | |/ | |/|
* | | Remove unnecessary prometheus_service method, that is now handled by new auto...Pawel Chojnacki2017-06-201-4/+0
* | | Move Prometheus service to project modelPawel Chojnacki2017-06-163-12/+12
* | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-1649-206/+490
|\ \ \ | |/ /
| * | Deserialise existing custom notification settingsdeserialize-custom-notificationsSean McGivern2017-06-151-2/+24