Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add feature spec for labels subscription | Douglas Barbosa Alexandre | 2016-11-17 | 1 | -0/+74 |
| | |||||
* | Avoid code duplication for label subscription status on label partial | Douglas Barbosa Alexandre | 2016-11-17 | 3 | -15/+9 |
| | |||||
* | Rename LabelSubscription javascript to ProjectLabelSubscription | Douglas Barbosa Alexandre | 2016-11-17 | 2 | -3/+3 |
| | |||||
* | Fix label subscription menu on small screens resolution | Douglas Barbosa Alexandre | 2016-11-17 | 3 | -16/+42 |
| | |||||
* | Allow users to subscribe to a group label at group or project level | Douglas Barbosa Alexandre | 2016-11-17 | 5 | -11/+122 |
| | |||||
* | Use button instead of an icon to subscribe/unsubscribe to labels | Douglas Barbosa Alexandre | 2016-11-17 | 4 | -14/+49 |
| | |||||
* | Add CHANGELOG entry | Douglas Barbosa Alexandre | 2016-11-17 | 1 | -0/+4 |
| | |||||
* | Add toggle_subscription action to Groups::LabelsController | Douglas Barbosa Alexandre | 2016-11-17 | 3 | -1/+33 |
| | |||||
* | Allow subscriptions to be created without a project | Douglas Barbosa Alexandre | 2016-11-17 | 5 | -42/+119 |
| | |||||
* | Use subqueries instead of joins to migrate subscriptions | Douglas Barbosa Alexandre | 2016-11-17 | 1 | -39/+24 |
| | |||||
* | Add helper method to toggle label subscription on labels controller spec | Douglas Barbosa Alexandre | 2016-11-17 | 1 | -2/+6 |
| | |||||
* | Remove default value for `project` argument on subscribable concern | Douglas Barbosa Alexandre | 2016-11-17 | 22 | -98/+96 |
| | |||||
* | Use @project as default on ToggleSubscriptionAction concern | Douglas Barbosa Alexandre | 2016-11-17 | 4 | -13/+1 |
| | |||||
* | Allow users to subscribe to group labels at project-level | Douglas Barbosa Alexandre | 2016-11-17 | 4 | -27/+34 |
| | |||||
* | Pass project to Entities::Label to check if user is subscribed | Douglas Barbosa Alexandre | 2016-11-17 | 2 | -7/+7 |
| | |||||
* | Fix specs to pass a project when creating subscriptions | Douglas Barbosa Alexandre | 2016-11-17 | 3 | -7/+9 |
| | |||||
* | Refactoring label subscription toggle button text to accept a project | Douglas Barbosa Alexandre | 2016-11-17 | 2 | -4/+4 |
| | |||||
* | Refactoring label subscription status to accept a project | Douglas Barbosa Alexandre | 2016-11-17 | 2 | -4/+4 |
| | |||||
* | Refactoring notification service to find subscriptions per project | Douglas Barbosa Alexandre | 2016-11-17 | 2 | -50/+92 |
| | |||||
* | Add subscribable_project to ToggleSubscriptionAction concern | Douglas Barbosa Alexandre | 2016-11-17 | 4 | -1/+17 |
| | |||||
* | Refactoring Subscribable concern to accept a project | Douglas Barbosa Alexandre | 2016-11-17 | 3 | -38/+46 |
| | |||||
* | Fix small typo on NotificationService | Douglas Barbosa Alexandre | 2016-11-17 | 1 | -1/+1 |
| | |||||
* | Add unique index to subscriptions on subscribable and user and project | Douglas Barbosa Alexandre | 2016-11-17 | 5 | -3/+34 |
| | |||||
* | Migrate subscribable project id to the subscriptions table | Douglas Barbosa Alexandre | 2016-11-17 | 1 | -0/+59 |
| | |||||
* | Add project_id to subscriptions | Douglas Barbosa Alexandre | 2016-11-17 | 4 | -0/+34 |
| | |||||
* | Merge branch '23990-project-show-error-when-empty-repo' into 'master' | Douwe Maan | 2016-11-17 | 3 | -1/+50 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 500 error on project show when user is not logged in and project is still empty ## What does this MR do? Aims to fix the 500 error when the project is empty and the user is not logged in and tries to access project#show ## Screenshots (if relevant) When the project is empty and the user is not logged in we default to the empty project partial instead of readme. ![Screen_Shot_2016-11-11_at_22.54.21](/uploads/3d87e65195376c85d3e515e6d5a9a850/Screen_Shot_2016-11-11_at_22.54.21.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23990 See merge request !7376 | ||||
| * | adds fix for security issue when annonymous user does not have access to ↵23990-project-show-error-when-empty-repo | tiagonbotelho | 2016-11-17 | 5 | -70/+92 |
| | | | | | | | | repository we now display the activity feed instead of the readme | ||||
| * | moves empty view logic onto empty partial to make it reusable and fixes tests | tiagonbotelho | 2016-11-15 | 3 | -63/+61 |
| | | |||||
| * | change empty project view to annonymous user from activity to empty partial | tiagonbotelho | 2016-11-11 | 4 | -11/+11 |
| | | |||||
| * | adds guard clause for readme model method and initializes a new view with ↵ | tiagonbotelho | 2016-11-11 | 4 | -1/+30 |
| | | | | | | | | proper stylesheets | ||||
* | | Merge branch 'jira_service_simplify' into 'master' | Sean McGivern | 2016-11-17 | 3 | -11/+16 |
|\ \ | | | | | | | | | | | | | | | | | | | JiraService: simplify url generation Fixes #24085 See merge request !7307 | ||||
| * | | stub not needed | Jarka Kadlecova | 2016-11-12 | 1 | -1/+0 |
| | | | |||||
| * | | add blank line | Jarka Kadlecova | 2016-11-12 | 1 | -0/+1 |
| | | | |||||
| * | | simplify url generation | Jarka Kadlecova | 2016-11-05 | 3 | -12/+17 |
| | | | |||||
* | | | Merge branch 'docs/environments' into 'master' | Achilleas Pipinellis | 2016-11-17 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | Mention Git strategy none See merge request !7530 | ||||
| * | | | Mention Git strategy none | Achilleas Pipinellis | 2016-11-17 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge branch 'highlight-first-user-autocomplete-option' into 'master' | Fatih Acet | 2016-11-17 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Highlight first user autocomplete option See merge request !7520 | ||||
| * | | | | Highlight first user autocomplete optionhighlight-first-user-autocomplete-option | Douwe Maan | 2016-11-17 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'docs/review-apps' into 'master' | Achilleas Pipinellis | 2016-11-17 | 5 | -4/+151 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for Review Apps ## What does this MR do? Add docs for review apps. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23484 See merge request !6982 | ||||
| * | | | | | Add 8.14 to versions with further additions to review apps | Achilleas Pipinellis | 2016-11-17 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | Add Limitations sections to environments and review apps docs | Achilleas Pipinellis | 2016-11-17 | 2 | -12/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | Add link to environments docs | Achilleas Pipinellis | 2016-11-17 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Fix URL to review apps docs | Achilleas Pipinellis | 2016-11-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add a prerequisites section, add some links | Achilleas Pipinellis | 2016-11-17 | 1 | -5/+22 |
| | | | | | | |||||
| * | | | | | Link to NGINX example project for the time being | Achilleas Pipinellis | 2016-11-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | Get rid most of the irrelevant sections | Achilleas Pipinellis | 2016-11-17 | 2 | -32/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | Add note about current limitation in $CI_BUILD_REF_NAME | Achilleas Pipinellis | 2016-11-17 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | Add an intro and an Overview section for Review Apps | Achilleas Pipinellis | 2016-11-17 | 1 | -43/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | WIP review apps | Achilleas Pipinellis | 2016-11-17 | 1 | -0/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23484 [ci skip] | ||||
| * | | | | | Add Review apps link to CI README | Achilleas Pipinellis | 2016-11-17 | 1 | -3/+7 |
| | | | | | |