summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improvements after reviewFilipa Lacerda2016-11-171-13/+41
* Adds helper to verify empty objectFilipa Lacerda2016-11-171-3/+18
* Fix after reviewFilipa Lacerda2016-11-171-4/+1
* Swaps url for paths in mock dataFilipa Lacerda2016-11-171-11/+10
* Fix Rubocop offense for lines in environment specsGrzegorz Bizon2016-11-171-1/+0
* Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-1746-227/+754
|\
| * Merge branch 'feature/subscribe-to-group-level-labels' into 'master' Sean McGivern2016-11-1746-227/+754
| |\
| | * Remove extra subscribable_type filter on migrationDouglas Barbosa Alexandre2016-11-171-3/+3
| | * Add feature spec for labels subscriptionDouglas Barbosa Alexandre2016-11-171-0/+74
| | * Avoid code duplication for label subscription status on label partialDouglas Barbosa Alexandre2016-11-173-15/+9
| | * Rename LabelSubscription javascript to ProjectLabelSubscriptionDouglas Barbosa Alexandre2016-11-172-3/+3
| | * Fix label subscription menu on small screens resolutionDouglas Barbosa Alexandre2016-11-173-16/+42
| | * Allow users to subscribe to a group label at group or project levelDouglas Barbosa Alexandre2016-11-175-11/+122
| | * Use button instead of an icon to subscribe/unsubscribe to labelsDouglas Barbosa Alexandre2016-11-174-14/+49
| | * Add CHANGELOG entryDouglas Barbosa Alexandre2016-11-171-0/+4
| | * Add toggle_subscription action to Groups::LabelsControllerDouglas Barbosa Alexandre2016-11-173-1/+33
| | * Allow subscriptions to be created without a projectDouglas Barbosa Alexandre2016-11-175-42/+119
| | * Use subqueries instead of joins to migrate subscriptionsDouglas Barbosa Alexandre2016-11-171-39/+24
| | * Add helper method to toggle label subscription on labels controller specDouglas Barbosa Alexandre2016-11-171-2/+6
| | * Remove default value for `project` argument on subscribable concernDouglas Barbosa Alexandre2016-11-1722-98/+96
| | * Use @project as default on ToggleSubscriptionAction concernDouglas Barbosa Alexandre2016-11-174-13/+1
| | * Allow users to subscribe to group labels at project-levelDouglas Barbosa Alexandre2016-11-174-27/+34
| | * Pass project to Entities::Label to check if user is subscribedDouglas Barbosa Alexandre2016-11-172-7/+7
| | * Fix specs to pass a project when creating subscriptionsDouglas Barbosa Alexandre2016-11-173-7/+9
| | * Refactoring label subscription toggle button text to accept a projectDouglas Barbosa Alexandre2016-11-172-4/+4
| | * Refactoring label subscription status to accept a projectDouglas Barbosa Alexandre2016-11-172-4/+4
| | * Refactoring notification service to find subscriptions per projectDouglas Barbosa Alexandre2016-11-172-50/+92
| | * Add subscribable_project to ToggleSubscriptionAction concernDouglas Barbosa Alexandre2016-11-174-1/+17
| | * Refactoring Subscribable concern to accept a projectDouglas Barbosa Alexandre2016-11-173-38/+46
| | * Fix small typo on NotificationServiceDouglas Barbosa Alexandre2016-11-171-1/+1
| | * Add unique index to subscriptions on subscribable and user and projectDouglas Barbosa Alexandre2016-11-175-3/+34
| | * Migrate subscribable project id to the subscriptions tableDouglas Barbosa Alexandre2016-11-171-0/+59
| | * Add project_id to subscriptionsDouglas Barbosa Alexandre2016-11-174-0/+34
* | | Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-17339-1244/+4559
|\ \ \ | |/ /
| * | Merge branch 'chat-name-authorize' into 'master' Rémy Coutable2016-11-1722-1/+522
| |\ \
| | * | Change last_used_at to use touchchat-name-authorizeKamil Trzcinski2016-11-171-1/+1
| | * | Add chat_name partialKamil Trzcinski2016-11-173-30/+30
| | * | Fix code reviewKamil Trzcinski2016-11-171-1/+1
| | * | Fix code review style issuesKamil Trzcinski2016-11-172-2/+2
| | * | Add specs for testing authorization and deny of chat userKamil Trzcinski2016-11-162-0/+81
| | * | Improve code design after code reviewKamil Trzcinski2016-11-1611-21/+24
| | * | Fix `chat_names` before_actionKamil Trzcinski2016-11-161-1/+1
| | * | Merge remote-tracking branch 'origin/master' into chat-name-authorizeKamil Trzcinski2016-11-16399-10789/+12400
| | |\ \
| | * | | Add most of specs for chat namesKamil Trzcinski2016-11-1612-22/+182
| | * | | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-1612-1/+278
| * | | | Merge branch 'rs-remove-ci-gems' into 'master' Kamil Trzciński2016-11-172-13/+0
| |\ \ \ \
| | * | | | Remove unused nested_form gemrs-remove-ci-gemsRobert Speicher2016-11-172-5/+0
| | * | | | Remove activerecord-session_store gemRobert Speicher2016-11-172-8/+0
| * | | | | Merge branch '23740-create-a-doc-for-the-ce-ee-development-workflow' into 'ma...Robert Speicher2016-11-172-0/+273
| |\ \ \ \ \
| | * | | | | Fix typosRémy Coutable2016-11-171-8/+7
View Lorry Controller Status