summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* Use `diff_base_commit` instead of `target_branch` to generate diffsGabriel Mazetto2016-03-291-2/+2
|
* Merge branch 'fix-14607' into 'master' Douwe Maan2016-03-291-1/+5
|\ | | | | | | | | | | | | Ensure private project snippets are not viewable by unauthorized people Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607 See merge request !1946
| * Ensure project snippets have their own access levelRémy Coutable2016-03-251-1/+1
| |
| * Ensure private project snippets are not viewable by unauthorized peopleRémy Coutable2016-03-251-1/+5
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607.
* | Edit button leaves modal openJacob Schatz2016-03-251-1/+1
| | | | | | | | Add user avatar to user selection
* | Remove unnecessary sentenceAlfredo Sumaran2016-03-251-1/+0
| |
* | New dropdowns work on merge requests too!Jacob Schatz2016-03-251-4/+1
| |
* | Adds new dropdown ajax to user selectionJacob Schatz2016-03-251-1/+1
| |
* | Add labels as proper POST arrays using new dropdownJacob Schatz2016-03-251-1/+7
| |
* | Add milestone sidebar update via JSONJacob Schatz2016-03-251-1/+1
| |
* | Ajax call to milestones via new dropdownsJacob Schatz2016-03-251-1/+1
| |
* | Sidebar milestone updatable via JSONJacob Schatz2016-03-252-5/+1
| |
* | Updates sidebar milestone to use new dropdownsJacob Schatz2016-03-251-0/+1
|/
* Address feedbackDouwe Maan2016-03-222-2/+3
|
* Merge branch 'master' into issue_12658Douwe Maan2016-03-219-9/+19
|\ | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
| * Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-219-9/+15
| |\
| | * Merge branch 'feature/issue-move' into 'master' Kamil Trzciński2016-03-211-0/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to move issue to another project Tasks: - [x] Create scaffold of service that will move issue to another project. - [x] Close old issue, add system note about moving issue to a new project. - [x] Create a new issue, add system note about issue being moved from old project. - [x] Check if issue can be moved to another project before executing service - [x] Check permissions when moving an issue (`:admin_issue` ability) - [x] Display select box for a new project when editing an issue - [x] Show only projects that issue can be moved into in that select box - [x] Add project select handler, helper and some permission filters to it - [x] Preserve as much information as possible, including author - [x] Prepare mechanisms that unfolds local references in issue description - [x] Rewrite issue description with references unfolding and add some specs for it - [x] Rewrite all system notes and comments attached to issue that is being moved - [x] Update `Label` so that is was able to create cross reference labels (separate MR) - [x] Add notifications about moving issue to another project - [x] Display confirmation alert/message when issue move has been requested - [x] Make it possible to undo selecting project where issue will be moved to - [x] Add column to issue, that will indicate if it has been moved to another project - [x] Do not allow to move issue that has been already moved - [x] Write top-to-bottom feature spec in RSpec instead of Spinach UI: ![issue_move_ui](/uploads/b3c6b563362c1fded9082cc0f51e5a74/issue_move_ui.png) ![issue_move_tooltip](/uploads/2ab913b06f52df1cafde9abe89bd9cb8/issue_move_tooltip.png) Closes #3024 See merge request !2831
| | | * Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-201-2/+9
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix bug where wrong commit ID was being used in a merge request diff to show old image Remove CHANGELOG item that was added during merge resolution Improve the "easy WIP & un-WIP from link" feature Fix specs \#to_branch_name now uses the iid as postfix Add label description in tooltip to labels in issue index and sidebar Easily (un)mark merge request as WIP using link Use specialized system notes when MR is (un)marked as WIP another attempt to fix oauth issue attempting to fix omniauth problem Conflicts: app/assets/javascripts/issuable_form.js.coffee
| | | * | Do not pass params that are not used in issue move serviceGrzegorz Bizon2016-03-201-1/+1
| | | | |
| | | * | Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-195-18/+42
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (121 commits) Dedupe labels in labels selector in Dashboard pages Refactor colors and lists Add a safeguard in MergeRequest#compute_diverged_commits_count Fix an issue when the target branch of a MR had been deleted Add avatar to issue and MR pages header Cleanup somce css colors Re-group scss variables Refactor `Todo#target` Fixes issue with filter label missing on labels & milestones Rename `Todo#to_reference` to `Todo#target_reference` Fixed failing tests Updated controller with before_action Fixed other issues based on feedback Fixes issue on dashboard issues Full labels data in JSON Fixed issue with labels dropdown getting wrong labels Update CHANGELOG Use `Note#for_project_snippet?` to skip notes on project snippet Use `Commit#short_id` instead of `Commit.truncate_sha` Reuse `for_commit?` on conditional validations Update schema info comment on todo related files ... Conflicts: app/models/issue.rb db/schema.rb spec/models/issue_spec.rb
| | | * | | Improvements in issue move feaure (refactoring)Grzegorz Bizon2016-03-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | According to endbosses' suggestions.
| | | * | | Do not pass unsanitized params to issue move serviceGrzegorz Bizon2016-03-171-1/+2
| | | | | |
| | | * | | Add issue move implementation to controllerGrzegorz Bizon2016-03-171-0/+5
| | | | | |
| | * | | | Use the configured Kaminari "per page" defaultrs-use-kaminari-defaultRobert Speicher2016-03-199-9/+9
| | | |_|/ | | |/| |
| * | | | Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-212-4/+6
| | | | |
| * | | | Satisfy rubocopZeger-Jan van de Weg2016-03-191-3/+0
| | | | |
| * | | | Dry destroy action on issuablesZeger-Jan van de Weg2016-03-192-13/+7
| | | | |
| * | | | Soft delete issuablesZeger-Jan van de Weg2016-03-191-0/+11
| |/ / /
* | | | Fix some specsDouwe Maan2016-03-201-1/+1
| | | |
* | | | Tweaks, refactoring, and specsDouwe Maan2016-03-203-14/+69
|/ / /
* | | Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-1815-75/+131
|\ \ \ | | |/ | |/|
| * | Fixed failing testsPhil Hughes2016-03-181-1/+1
| | |
| * | Updated controller with before_actionPhil Hughes2016-03-181-4/+4
| | | | | | | | | | | | Fixed other issues based on feedback
| * | Full labels data in JSONPhil Hughes2016-03-181-1/+1
| | |
| * | Fixed issue with labels dropdown getting wrong labelsPhil Hughes2016-03-182-0/+15
| | |
| * | Restrict access to confidential issuesDouglas Barbosa Alexandre2016-03-171-1/+5
| | |
| * | Add an option to user make an issue confidentialDouglas Barbosa Alexandre2016-03-171-1/+1
| | |
| * | Merge branch 'new-branch-button-issue' into 'master' Douwe Maan2016-03-172-3/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New branch button on issues Creates a button which creates a branch for you, referencing the original issue in the branch name. When creating the MR the text `Closes #iid` is appended to the description field. The button; with styling ![Screenshot_from_2016-02-13_17-28-54](/uploads/9595fbfef88c10a499829beaa3db11c1/Screenshot_from_2016-02-13_17-28-54.png) Links to the related branches on the issue ![Screenshot_from_2016-02-13_17-31-48](/uploads/ee7a78754eb5e2389f8671771bb59af9/Screenshot_from_2016-02-13_17-31-48.png) Styled like the MR links ![Screenshot_from_2016-02-13_17-31-53](/uploads/c60130333a650a16f51b014aeb1458c3/Screenshot_from_2016-02-13_17-31-53.png) Please provide input on the following; the CI repo on the GDK had the following happening with the current way I implemented the matching: ![Screenshot_from_2016-02-14_08-57-19](/uploads/35e7a3687a0fa801aba1ad66305ab2ff/Screenshot_from_2016-02-14_08-57-19.png) Closes #3886 cc @DouweM See merge request !2808
| | * | Incorporate reviewZeger-Jan van de Weg2016-03-151-4/+3
| | | |
| | * | Enhance new branch button on an issueZeger-Jan van de Weg2016-03-151-0/+6
| | | |
| | * | new-branch-buttonZeger-Jan van de Weg2016-03-152-3/+14
| | |/
| * | Reuse `no_cache_headers` method in badges controllerGrzegorz Bizon2016-03-171-12/+1
| |/
| * Move the #toggle_subscription controller method to a concernRémy Coutable2016-03-153-28/+15
| |
| * Improving the original label-subscribing implementationRémy Coutable2016-03-153-0/+6
| | | | | | | | | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
| * Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-151-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
| * Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-142-0/+24
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring from EE: Share Project with Group - [x] Models and migrations - [x] Logic, UI - [x] Tests - [x] Documentation - [x] Share with group lock - [x] Api feature - [x] Api docs - [x] Api tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #12831 cc @DouweM @rspeicher @vsizov See merge request !3186
| | * Render project members from shared groupDmitriy Zaporozhets2016-03-121-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Add functionality to setup share of project with group via project settingsDmitriy Zaporozhets2016-03-111-0/+23
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | ContinueToParams -> ContinueParamsZeger-Jan van de Weg2016-03-132-2/+2
| | |
| * | Check redirect path in the continue_paramsZeger-Jan van de Weg2016-03-132-21/+4
| |/ | | | | | | | | | | Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2649 https://gitlab.com/gitlab-org/gitlab-ce/issues/13956
View Lorry Controller Status