summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/subscribe-to-group-level-labels' into 'master' Sean McGivern2016-11-174-21/+54
|\
| * Allow users to subscribe to a group label at group or project levelDouglas Barbosa Alexandre2016-11-171-4/+23
| * Allow subscriptions to be created without a projectDouglas Barbosa Alexandre2016-11-172-10/+17
| * Remove default value for `project` argument on subscribable concernDouglas Barbosa Alexandre2016-11-172-18/+16
| * Refactoring Subscribable concern to accept a projectDouglas Barbosa Alexandre2016-11-172-17/+23
| * Add unique index to subscriptions on subscribable and user and projectDouglas Barbosa Alexandre2016-11-171-2/+2
| * Add project_id to subscriptionsDouglas Barbosa Alexandre2016-11-171-0/+3
* | Merge branch 'chat-name-authorize' into 'master' Rémy Coutable2016-11-172-0/+13
|\ \ | |/ |/|
| * Merge remote-tracking branch 'origin/master' into chat-name-authorizeKamil Trzcinski2016-11-167-18/+53
| |\
| * | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-162-0/+13
* | | Merge branch 'jira_service_simplify' into 'master' Sean McGivern2016-11-171-10/+8
|\ \ \
| * | | simplify url generationJarka Kadlecova2016-11-051-10/+8
* | | | Merge branch 'feature/environment-teardown-when-branch-deleted' into 'master' Kamil Trzciński2016-11-173-16/+32
|\ \ \ \
| * | | | Add specs for environments recently updated on branchGrzegorz Bizon2016-11-161-1/+1
| * | | | Refactor methods for environments in project modelGrzegorz Bizon2016-11-162-6/+13
| * | | | Improve readability in project model for environmentsGrzegorz Bizon2016-11-161-2/+2
| * | | | Select recently updated environments for auto-closeGrzegorz Bizon2016-11-152-2/+6
| * | | | Add feature tests for environments auto-closeGrzegorz Bizon2016-11-151-0/+1
| * | | | Do not call environments service in repository modelGrzegorz Bizon2016-11-111-13/+2
| * | | | Stop environments for branch after branch removalGrzegorz Bizon2016-11-092-4/+15
| * | | | Make commit an optional arg for environments searchGrzegorz Bizon2016-11-092-17/+21
* | | | | Merge branch '24107-slack-comment-link' into 'master' Rémy Coutable2016-11-171-6/+6
|\ \ \ \ \
| * | | | | Change the slack notification comment link.Herbert Kagumba2016-11-161-6/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix/trace-patch-updated-at' into 'master' Kamil Trzciński2016-11-161-0/+5
|\ \ \ \ \
| * | | | | Update the updated_at of a build while patching the traceTomasz Maczukin2016-11-151-0/+5
| |/ / / /
* | | | | Merge branch '24496-fix-internal-api-project-lookup' into 'master' Sean McGivern2016-11-161-10/+0
|\ \ \ \ \
| * | | | | Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas2016-11-161-10/+0
| |/ / / /
* | | | | Merge branch 'patch-5' into 'master' Rémy Coutable2016-11-161-1/+1
|\ \ \ \ \
| * | | | | fix "Without projects" filterBen Bodenmiller2016-11-161-1/+1
| |/ / / /
* | | | | Merge branch '23824-activity-page-does-not-show-commits-comments' into 'master' Robert Speicher2016-11-161-3/+3
|\ \ \ \ \
| * | | | | Allow commit note to be visible if repo is visible23824-activity-page-does-not-show-commits-commentsRémy Coutable2016-11-161-3/+3
| |/ / / /
* | | | | Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan2016-11-162-10/+14
|\ \ \ \ \
| * | | | | Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-162-10/+14
* | | | | | Merge branch '23117-search-for-a-filename-in-a-project' into 'master' Sean McGivern2016-11-163-6/+15
|\ \ \ \ \ \
| * | | | | | Search for a filename in a project23117-search-for-a-filename-in-a-projectValery Sizov2016-11-163-6/+15
| | |/ / / / | |/| | | |
* | | | | | Use setter for key instead AR callbackSemyon Pupkov2016-11-161-3/+4
|/ / / / /
* | | | | Merge branch 'master-recursiveTree' into 'master' Douwe Maan2016-11-152-4/+22
|\ \ \ \ \
| * | | | | Issue #4270: Recursive option for files through APIRebeca Méndez2016-11-122-4/+22
* | | | | | Merge branch 'fix-migration-changes' into 'master' Stan Hu2016-11-151-4/+1
|\ \ \ \ \ \
| * | | | | | Use `default_value_for` to handle null values in only_allow_merge_if_all_disc...fix-migration-changesAlejandro Rodríguez2016-11-141-4/+1
| | |/ / / / | |/| | | |
* | | | | | Fixed issue boards when not logged inissue-boards-signed-out-statePhil Hughes2016-11-141-1/+1
|/ / / / /
* | | | | Merge branch 'sh-fix-sidekiq-throttling-init' into 'master' Robert Speicher2016-11-141-0/+10
|\ \ \ \ \
| * | | | | Only turn on Sidekiq throttling if application settings existssh-fix-sidekiq-throttling-initStan Hu2016-11-121-0/+10
* | | | | | Merge branch 'zj-remove-unneeded-checks' into 'master' Robert Speicher2016-11-141-6/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove unneeded nil checkszj-remove-unneeded-checksZ.J. van de Weg2016-11-121-6/+0
| |/ / / /
* | | | | Does not raise error when Note not found when processing NewNoteWorkerOswaldo Ferreira2016-11-111-0/+1
|/ / / /
* | | | Merge branch '24386-8-14-rc1-requires-quite-amount-of-downtime' into 'master' Stan Hu2016-11-111-0/+4
|\ \ \ \
| * | | | Update 8.14-rc1 migrations to minimize downtime and deploy timeAlejandro Rodríguez2016-11-111-0/+4
* | | | | Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan2016-11-111-0/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttlingPatricio Cano2016-11-111-1/+1
View Lorry Controller Status