summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* fix blob controller spec failure - updated not to use file-path-fix/blob-controller-specJames Lopez2016-11-291-1/+1
|
* Merge branch 'jej-fix-missing-access-check-on-issues' into 'security'Douwe Maan2016-11-282-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | Fix missing access checks on issue lookup using IssuableFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested - [x] :white_check_mark: app/controllers/projects/branches_controller.rb:39 - `before_action :authorize_push_code!` helpes limit/prevent exploitation. Always checks for reporter access so fine with confidential issues, issues only visible to team, etc. - [x] :traffic_light: app/models/cycle_analytics/summary.rb:9 [`.count`] - [x] :white_check_mark: app/controllers/projects/todos_controller.rb:19 - [x] Potential double render in app/controllers/projects/todos_controller.rb - https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#cedccb227af9bfdf88802767cb58d43c2b977439_24_24 See merge request !2030
* Merge branch 'jej-22869' into 'security'Douwe Maan2016-11-281-0/+49
| | | | | | | | | | | | | | | | | | Fix information disclosure in `Projects::BlobController#update` It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that. - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry 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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) https://gitlab.com/gitlab-org/gitlab-ce/issues/22869 See merge request !2023
* Rephrase some system notes to be compatible with new system note stylerephrase-system-notesDouwe Maan2016-11-241-1/+1
|
* Updated code based on feedbackfix/cycle-analytics-no-dataJames Lopez2016-11-211-2/+2
|
* Adds a flag to reflect whether or not there is data in cycle analyticsJames Lopez2016-11-211-0/+43
|
* Merge remote-tracking branch 'origin/master' into 22539-display-foldersKamil Trzcinski2016-11-184-9/+83
|\
| * Merge branch 'fix-singin-redirect-for-fork-new' into 'master' Sean McGivern2016-11-171-0/+58
| |\ | | | | | | | | | | | | | | | | | | Fixing the issue of visiting a project fork url giving 500 error when not signed… Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24302 See merge request !7392
| | * Remove newlines between context and it in addition to testing redirection ↵Cagdas Gerede2016-11-151-6/+1
| | | | | | | | | | | | for create action to import path
| | * Add authentication for for create action. Add more tests for for new and ↵Cagdas Gerede2016-11-151-6/+55
| | | | | | | | | | | | create actions
| | * Move sign_out out of it into beforeCagdas Gerede2016-11-131-2/+1
| | |
| | * Replace tabs with spacesEarth2016-11-131-1/+1
| | |
| | * Add a unit test for redirecting to sign-in page when user is not logged in ↵Earth2016-11-131-0/+15
| | | | | | | | | | | | and user visits the new fork page
| * | 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-171-1/+1
| | |
| * | Allow users to subscribe to group labels at project-levelDouglas Barbosa Alexandre2016-11-171-7/+19
| | |
| * | Merge branch '21992-disable-access-requests-by-default' into 'master' Robert Speicher2016-11-161-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the "request access" functionality by default for new groups and projects Currently this feature is enabled by default, and additional action is required to disable it. Closes #21992 Closes !7011 See merge request !7425
| | * | Make access request specs explicitly enable or disable access requests as ↵Nick Thomas2016-11-111-1/+1
| | |/ | | | | | | | | | required
* | | Add controller specs for environments index actionGrzegorz Bizon2016-11-161-6/+27
|/ /
* | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-151-4/+54
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add button to delete all merged branches ## What does this MR do? It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs. **Note** ~~This MR is WIP until MR !6408 is merged.~~ ## Are there points in the code the reviewer needs to double check? The UX of the actual "Delete merged branches" button. ## Why was this MR needed? Fixes #21076 ## Screenshots ![Branches page without "Delete all merged" button](/uploads/3a2936a83c3547a0fce92a74af880a2d/Screen_Shot_2016-10-17_at_20.06.30.png) Before: ![Screen_Shot_2016-10-17_at_20.07.11](/uploads/55efcebf4e0a45dbfc70ba4a11ca152c/Screen_Shot_2016-10-17_at_20.07.11.png) After: ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 - [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 you do - 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 #21076 See merge request !6449
| * | Add button to delete all merged branchesToon Claes2016-11-091-4/+54
| |/ | | | | | | | | | | | | | | It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs. Fixes #21076.
* | Ensure labels are loaded on "show" methods of MRAlex Sanford2016-11-111-0/+25
|/ | | | | Previously, they were only being loaded on the actual `show` action, but not the actions representing the tabs (commits, builds, etc).
* Complete and improve specsRémy Coutable2016-11-041-14/+54
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Add setting to only allow merge requests to be merged when all discussions ↵Rodolfo Santos2016-11-041-0/+26
| | | | | | are resolved Signed-off-by: Rémy Coutable <remy@rymai.me>
* Implement CreateMembers service to make controller thinrefactor_group_membersValery Sizov2016-11-011-34/+34
|
* Merge branch '23106-events-default-scope-results-in-a-slow-query' into 'master' Yorick Peterse2016-10-311-1/+1
|\ | | | | | | | | Optimize Event queries by removing default order See merge request !7130
| * Optimize Event queries by removing default order23106-events-default-scope-results-in-a-slow-queryAlejandro Rodríguez2016-10-271-1/+1
| |
* | Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-createAdam Niedzielski2016-10-281-5/+16
|/ | | | | | Do not pass project.owner because it may return a group and Labels::FindOrCreateService throws an error in this case. Fixes #23694.
* Merge branch 'master' into issue-board-sidebarissue-board-sidebarPhil Hughes2016-10-263-1/+100
|\
| * Improve create project member test at project_members_controller_specDmitriy Zaporozhets2016-10-241-25/+16
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-241-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
| * Fix status code expectationRémy Coutable2016-10-221-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Fix error in generating labelssh-fix-broken-label-controllerStan Hu2016-10-221-0/+15
| | | | | | | | | | | | | | | | | | Attempting to generate default set of labels would result in an error: ArgumentError: wrong number of arguments (given 1, expected 0) Closes #23649
| * Merge branch 'fix_project_member_access_levels' into 'master' Sean McGivern2016-10-211-0/+36
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Fix project member access levels Migrate invalid project members (owner -> master) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18616 See merge request !6957
| | * Fix project member access levelsfix_project_member_access_levelsValery Sizov2016-10-211-0/+36
| | |
| * | Merge branch 'zj-use-iid-deployment-refs' into 'master' Kamil Trzciński2016-10-201-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | Use iid deployment refs This fixes the 404, because `find_by` will return nil instead of throwing an error. See merge request !7021
| | * Use deployment IID when saving refsZ.J. van de Weg2016-10-201-1/+1
| | |
* | | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-192-139/+117
|\ \ \ | |/ /
| * | Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-191-20/+41
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add group level labels ## What does this MR do? Add group level labels. ## Are there points in the code the reviewer needs to double check? * `LabelsFinder` * `Gitlab::Gfm::ReferenceRewriter` * `Banzai::Filter::LabelReferenceFilter` ## Why was this MR needed? We'll be adding more feature that allow you to do cross-project management of issues. ## Screenshots (if relevant) * Group Labels ![Group Labels](/uploads/2244c06ad68eae4fb246fb4c81bf8060/2.png) * Project Labels ![Project Labels](/uploads/c5839516d2282b51f7418d9dadbeceb4/1.png) * Expanded references for group labels when moving issue to another project ![Expanded references for group labels when moving issue to another project](/uploads/0c9ab248a8420d4978d59349ae3d42e5/3.png) ## Does this MR meet the acceptance criteria? - [x] [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) - [x] API support added - Tests - [x] 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) - [x] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #19997 See merge request !6425
| | * | Fix sorting by label prioritiesDouglas Barbosa Alexandre2016-10-191-12/+19
| | | |
| | * | Remove scopes/types for labelsDouglas Barbosa Alexandre2016-10-191-32/+6
| | | |
| | * | Remove project_labels from Projects::ApplicationControllerDouglas Barbosa Alexandre2016-10-191-20/+60
| | |/
| * | Change the order of tested methods in project_members_controller_specDmitriy Zaporozhets2016-10-191-44/+44
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Refactor project_members_controller_specdz-refactor-project-members-controller-specDmitriy Zaporozhets2016-10-191-78/+35
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-199-83/+495
|\ \ | |/
| * Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-0/+30
| |\
| | * Add test, fix merge errorzj-show-deployed-time-agoZ.J. van de Weg2016-10-141-0/+30
| | |
| * | Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+1
| | |
| * | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-131-0/+1
| | |
| * | Add JSON SchemaSean McGivern2016-10-131-0/+4
| | |