summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cs-fix-firefox-height' into 'master' Annabel Dunstone Gray2016-11-171-2/+2
|\
| * Fix line numbers not matching up with code in Firefox.cs-fix-firefox-heightConnor Shea2016-11-161-2/+2
* | Merge branch 'fix-singin-redirect-for-fork-new' into 'master' Sean McGivern2016-11-171-0/+1
|\ \
| * | Add authentication for for create action. Add more tests for for new and crea...Cagdas Gerede2016-11-151-2/+1
| * | Add a new line after the guard statement to be compatible with the style guide.Cagdas Gerede2016-11-121-0/+1
| * | Replaces conditional with guard statement.Cagdas Gerede2016-11-121-0/+1
| * | Temporary changeCagdas Gerede2016-11-121-1/+0
| * | Replace conditional with a guard statement.Cagdas Gerede2016-11-121-6/+3
| * | Fixing the issue of visiting a project fork url giving 500 error when not sig...Cagdas Gerede2016-11-101-2/+6
* | | Merge branch 'feature/subscribe-to-group-level-labels' into 'master' Sean McGivern2016-11-1717-75/+261
|\ \ \
| * | | 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 toggle_subscription action to Groups::LabelsControllerDouglas Barbosa Alexandre2016-11-171-0/+7
| * | | 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-176-24/+22
| * | | 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-173-20/+15
| * | | 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-171-13/+13
| * | | Add subscribable_project to ToggleSubscriptionAction concernDouglas Barbosa Alexandre2016-11-174-1/+17
| * | | Refactoring Subscribable concern to accept a projectDouglas Barbosa Alexandre2016-11-172-17/+23
| * | | 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-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-179-0/+217
|\ \ \ \
| * | | | 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-171-1/+1
| * | | | Improve code design after code reviewKamil Trzcinski2016-11-164-11/+13
| * | | | Fix `chat_names` before_actionKamil Trzcinski2016-11-161-1/+1
| * | | | Merge remote-tracking branch 'origin/master' into chat-name-authorizeKamil Trzcinski2016-11-16116-562/+822
| |\ \ \ \
| * | | | | Add most of specs for chat namesKamil Trzcinski2016-11-163-9/+32
| * | | | | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-168-0/+192
| | |_|/ / | |/| | |
* | | | | Merge branch 'assignee-dropdown-autocomplete' into 'master' Fatih Acet2016-11-171-1/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Include author in assignee dropdown searchassignee-dropdown-autocompletePhil Hughes2016-11-171-1/+7
| | |/ / | |/| |
* | | | Merge branch '23990-project-show-error-when-empty-repo' into 'master' Douwe Maan2016-11-171-1/+5
|\ \ \ \
| * | | | adds fix for security issue when annonymous user does not have access to repo...23990-project-show-error-when-empty-repotiagonbotelho2016-11-173-62/+62
| * | | | moves empty view logic onto empty partial to make it reusable and fixes teststiagonbotelho2016-11-152-59/+56
| * | | | change empty project view to annonymous user from activity to empty partialtiagonbotelho2016-11-113-5/+8
| * | | | adds guard clause for readme model method and initializes a new view with pro...tiagonbotelho2016-11-112-1/+5
* | | | | Merge branch 'jira_service_simplify' into 'master' Sean McGivern2016-11-171-10/+8
|\ \ \ \ \
| * | | | | simplify url generationJarka Kadlecova2016-11-051-10/+8
* | | | | | Merge branch 'highlight-first-user-autocomplete-option' into 'master' Fatih Acet2016-11-171-1/+2
|\ \ \ \ \ \
| * | | | | | Highlight first user autocomplete optionhighlight-first-user-autocomplete-optionDouwe Maan2016-11-171-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'feature/environment-teardown-when-branch-deleted' into 'master' Kamil Trzciński2016-11-176-22/+97
|\ \ \ \ \ \