summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'adam-fix-wiki-links-markdown' into 'master' Sean McGivern2016-11-011-1/+2
|\ | | | | | | | | | | | | Fix relative links in Markdown wiki when displayed in "Project" tab Refers to #23806 See merge request !7218
| * Fix relative links in Markdown wiki when displayed in "Project" tabadam-fix-wiki-links-markdownAdam Niedzielski2016-11-011-1/+2
| | | | | | | | Refers to #23806.
* | Merge branch 'refactor_group_members' into 'master' Sean McGivern2016-11-011-10/+7
|\ \ | |/ |/| | | | | | | | | Implement CreateProjectMembers service to make controller thin Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23566 See merge request !7170
| * Implement CreateMembers service to make controller thinrefactor_group_membersValery Sizov2016-11-011-10/+7
| |
* | Remove unnecessary includes(:priorities) on Projects::LabelsControllerDouglas Barbosa Alexandre2016-10-311-1/+1
|/
* Merge branch '22271-drone-tag-pipeline-build' into 'master' Douwe Maan2016-10-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix lightweight tags not processed correctly by GitTagPushService ## What does this MR do? Fix lightweight tags not processed correctly by GitTagPushService ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Lightweight tags were being processed incorrectly, causing tag triggers to receive wrong information and not function properly. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22271 See merge request !6532
| * Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-281-1/+1
| | | | | | | | | | | | | | | | When we updated gitlab_git to 10.4.1, `tag.target` changed from pointing to the sha of the tag to the sha of the commit the tag points to. The problem is that only annotated tags have `object_sha`s, lightweight tags don't (it's nil), so (only) in their case we still need to use `tag.target`.
* | Merge branch '22392-add-x-of-y-tasks-completed-on-issuable' into 'master' Sean McGivern2016-10-282-2/+2
|\ \ | |/ |/| | | | | | | | | add "x of y tasks completed" on issuable Closes #22392 See merge request !6527
| * add "x of y tasks completed" on issuableGuilherme Salazar2016-10-282-2/+2
| | | | | | | | | | | | fix issues pointed out in !6527 add task completion status feature to CHANGELOG
* | Fixed boards store specissue-board-welcome-cookie-monsterPhil Hughes2016-10-281-2/+1
| |
* | Delete issue board welcome cookie when project is newPhil Hughes2016-10-281-1/+4
|/
* Refactor JIRA service to use gemDrew Blessing2016-10-261-1/+1
|
* Merge branch 'master' into issue-board-sidebarissue-board-sidebarPhil Hughes2016-10-265-21/+14
|\
| * Merge branch 'security-fix-leaking-namespace-name' into 'security' Douwe Maan2016-10-241-2/+2
| | | | | | | | | | Check that user has access to a given namespace to prevent leaking namespace names. See merge request !2009
| * Update project member controller to match recent master logicyesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-successDmitriy Zaporozhets2016-10-241-9/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add parentheses around return redirect_to methodDmitriy Zaporozhets2016-10-242-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Refactor groups/projects members controllerDmitriy Zaporozhets2016-10-242-9/+11
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-242-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Disable {project, group} members submit button if no users If no users are selected, the submit button should be disabled. - Alert user when no users were added to {project, group}. When no users were selected for adding, an alert message is flashed that no users were added. - Also, this commit adds a feedback when users were actually added to a project, in symmetry with how group members are handled. Closes #22967, #23270.
| * Merge branch '23341-fix-viewing-mr-from-deleted-project' into 'master' Douwe Maan2016-10-201-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a 500 error viewing an MR with a deleted source project ## What does this MR do? Allows merged MRs to be shown without any 500 errors if the source project is removed ## Are there points in the code the reviewer needs to double check? https://gitlab.com/gitlab-org/gitlab-ce/commit/31c37c6c38258684fc92e0d91119c33872e39034 fixed this for closed MRs only. I had trouble understanding the introduced helper and logic, so reverted it and keyed everything on the existence of the source project or branch directly. commits.json returns a 500 error for a closed or merged MR; the approach taken in the above MR was to hide the commits... tab, so I've run with that. For merged MRs, the commits (but not the pipeline data) are in the target project, so we *could* do better, but it's a fairly nasty intervention to make it happen. ## Why was this MR needed? Viewing merged MRs should work even if the fork they came from has been deleted or unlinked. ## Screenshots (if relevant) ![Screen_Shot_2016-10-19_at_17.56.37](/uploads/1aeadd5147b9a4ad29b946b1c7ea52cb/Screen_Shot_2016-10-19_at_17.56.37.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry 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 - [ ] 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 #23341 See merge request !6991
| | * Fix two CI endpoints for MRs where the source project is deletedNick Thomas2016-10-201-1/+1
| | |
| | * Fix the merge request view when source projects or branches are removedNick Thomas2016-10-201-1/+1
| | |
| * | Merge branch 'remove-unused-code-project-members-controller' into 'master' Dmitriy Zaporozhets2016-10-201-15/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed code from project members controller ## What does this MR do? Removes code that was meant to be added to a different branch as an experiment. See merge request !7012
| | * | Removed code from project members controllerPhil Hughes2016-10-201-15/+0
| | |/ | | | | | | | | | This code was meant to be added to another branch as an expirement, but instead was commited to wrong branch
| * | Merge branch 'refactoring_find_commits_method' into 'master' Sean McGivern2016-10-201-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | Refactoring find_commits method It's possible that `find_commits_by_message` return nil in array which is not OK. We have different checks outside of this method. This MR places all checks inside the method. See merge request !7000
| | * Refactoring find_commits functionalityValery Sizov2016-10-201-1/+1
| | |
* | | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-199-38/+169
|\ \ \ | |/ /
| * | Disable subscribing to group-level labelsDouglas Barbosa Alexandre2016-10-191-4/+1
| | |
| * | Use `includes(:priorities)` on Projects::LabelsControllerDouglas Barbosa Alexandre2016-10-191-1/+1
| | |
| * | Abstract LabelPriority away into methods on Label modelDouglas Barbosa Alexandre2016-10-191-8/+6
| | |
| * | Fix issue board related controllers to expose label priority per projectDouglas Barbosa Alexandre2016-10-192-5/+4
| | |
| * | Add support to group labels prioritization on project levelDouglas Barbosa Alexandre2016-10-191-6/+7
| | |
| * | Use present? instead of presence on Projects::IssuesController#indexDouglas Barbosa Alexandre2016-10-191-1/+1
| | |
| * | Render all available labels to project on project labels dropdownDouglas Barbosa Alexandre2016-10-191-1/+1
| | |
| * | Limit what label fields we expose on Projects::LabelsController#indexDouglas Barbosa Alexandre2016-10-191-1/+1
| | |
| * | Limit what label fields we expose on Groups::LabelsController#indexDouglas Barbosa Alexandre2016-10-191-1/+2
| | |
| * | Limit what label fields we expose on Dashboard::LabelsController#indexDouglas Barbosa Alexandre2016-10-191-1/+3
| | |
| * | Use present? instead of presence on Projects::MergeRequestsControllerDouglas Barbosa Alexandre2016-10-191-1/+4
| | |
| * | Reduce duplication between the project and group label formsDouglas Barbosa Alexandre2016-10-191-0/+1
| | |
| * | Remove scopes/types for labelsDouglas Barbosa Alexandre2016-10-191-9/+10
| | |
| * | Show labels widget on issuable sidebar if project has only group labelsDouglas Barbosa Alexandre2016-10-191-1/+1
| | |
| * | Avoid an extra a query per label when setting label priorityDouglas Barbosa Alexandre2016-10-191-2/+3
| | |
| * | List only labels that belongs to the group on the group issues pageDouglas Barbosa Alexandre2016-10-192-7/+10
| | |
| * | Remove project_labels from Projects::ApplicationControllerDouglas Barbosa Alexandre2016-10-195-22/+22
| | |
| * | List group labels on project labels pageDouglas Barbosa Alexandre2016-10-195-7/+34
| | |
| * | Allow user to create a board list based on a group labelDouglas Barbosa Alexandre2016-10-191-1/+4
| | |
| * | Allow users to apply group labels on Issues/MRsDouglas Barbosa Alexandre2016-10-194-6/+15
| | |
| * | Add CRUD for Group LabelsDouglas Barbosa Alexandre2016-10-191-0/+67
| | |
| * | Merge branch '21444-pipeliens-new-mr' into 'master' Fatih Acet2016-10-191-6/+13
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pipelines tab to new MR #### What does this MR do? Adds pipelines tab to new MRs #### Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_10.23.27_AM](/uploads/6c3f8f2be0cf9ba7cc78f6d918307ec0/Screen_Shot_2016-10-10_at_10.23.27_AM.png) ![Screen_Shot_2016-10-11_at_8.59.45_AM](/uploads/e67577d92327eafef6f04073f3d94212/Screen_Shot_2016-10-11_at_8.59.45_AM.png) #### What are the relevant issue numbers? Closes #21444 See merge request !6238
| | * Extract pipeline vars in merge requests controllerGrzegorz Bizon2016-10-181-5/+13
| | |
| | * Use all pipelines variable when creating merge requestGrzegorz Bizon2016-10-181-2/+2
| | |
View Lorry Controller Status