summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Gracefully handle notes on deleted commits in merge requestsStan Hu2016-03-281-2/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Closes #3250
* | | | | | Merge branch 'functional-sidebar' into 'master' Dmitriy Zaporozhets2016-03-282-1/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates sidebar to use new dropdowns for issues and merge requests Fixes #12935, #13164 See merge request !3175
| * | | | | Fix minor code style issuesJacob Schatz2016-03-251-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix underscore template error. Fix `=` spacing
| * | | | | Add multi select stay open functionalityJacob Schatz2016-03-251-1/+1
| | | | | |
* | | | | | Implementing 'Groups View' and 'TODOs View' as options for dashboard ↵Elias Werberich2016-03-241-1/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | preferences. Fixes #14585.
* | | | | Rename `Event#proper?` to `Event#visible_to_user?`Douglas Barbosa Alexandre2016-03-241-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'dropdown-alignment-fixes' into 'master' restrict_avatar_upload_to_image_filesJacob Schatz2016-03-231-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdown pixel perfect :tada: Closes #14333, #14331, #14472, #14515 See merge request !3337
| * | | | Added clear button to dropdown filterPhil Hughes2016-03-231-1/+2
| | | | |
* | | | | Fix an issue causing the Dashboard/Milestones page to be blankRémy Coutable2016-03-232-2/+2
|/ / / /
* | | | Address feedbackDouwe Maan2016-03-221-7/+16
| | | |
* | | | Merge branch 'master' into issue_12658Douwe Maan2016-03-216-23/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 'change_css_class_has_tooltip_to_has-tooltip' into 'master' Jacob Schatz2016-03-215-8/+8
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | change the css class has_tooltip to has-tooltip universally closes #14432 See merge request !3321
| | * | | change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltipArinde Eniola2016-03-205-8/+8
| | | | |
| * | | | Merge branch 'feature/issue-move' into 'master' Kamil Trzciński2016-03-211-0/+13
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * \ \ \ Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-199-38/+65
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | Add minor improvements in code related to issue moveGrzegorz Bizon2016-03-171-3/+5
| | | | | |
| | * | | | Use helper to create list of projects issue can be moved toGrzegorz Bizon2016-03-171-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | This also adds confirmation message if issue move has been requested.
| * | | | | Move tooltip to the right of the dropdownStan Hu2016-03-201-0/+4
| | | | | |
| * | | | | Use http_clone_button and ssh_clone_button to restore tooltip functionality ↵Stan Hu2016-03-191-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | in clone panel
| * | | | | Make HTTP(s) label consistent on clone barStan Hu2016-03-191-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Sites that use http:// for the external_url should always display HTTP on the clone bar. Similarly, sites that use https:// should show HTTPS.
* | | | | Tweaks, refactoring, and specsDouwe Maan2016-03-202-4/+8
| | | | |
* | | | | Merge branch 'master' into issue_12658Douwe Maan2016-03-209-45/+73
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'label-tooltip' into 'master' Douwe Maan2016-03-191-7/+8
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add label description in tooltip to labels in issue index and sidebar The tooltip can get quite big, but it’s so useful to inform people about what these labels mean new ![Screen_Shot_2016-03-08_at_11.48.28](/uploads/894baaaa1f789c3a2069a924d541e64b/Screen_Shot_2016-03-08_at_11.48.28.png) ![Screen_Shot_2016-03-08_at_11.48.20](/uploads/efe4fa0960054c4071b8f6bf83024403/Screen_Shot_2016-03-08_at_11.48.20.png) @JobV writes on Slack: > yeah I think it’s better than not, but I’d have to try it :smiley: > > cautious yes, revert if it’s annoying :wink: See merge request !3124
| | * | | Add label description in tooltip to labels in issue index and sidebarDouwe Maan2016-03-161-7/+8
| | |/ /
| * | | Dedupe labels in labels selector in Dashboard pagesfix/14418Rémy Coutable2016-03-182-21/+0
| | |/ | |/| | | | | | | | | | Also moved useless helper methods and directly to the DashboardController.
| * | Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master' Douwe Maan2016-03-181-3/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger a todo for mentions on commits page Closes #14006 * Screenshot: ![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png) See merge request !3262
| | * | Rename `Todo#to_reference` to `Todo#target_reference`Douglas Barbosa Alexandre2016-03-181-1/+1
| | | | | | | | | | | | | | | | Since we're not actually returning a todo reference.
| | * | Trigger a todo for mentions on commits pageDouglas Barbosa Alexandre2016-03-181-3/+8
| | | |
| * | | Fixed failing testsPhil Hughes2016-03-181-6/+5
| | | |
| * | | Updated controller with before_actionPhil Hughes2016-03-181-1/+1
| | | | | | | | | | | | | | | | Fixed other issues based on feedback
| * | | Fixes issue on dashboard issuesPhil Hughes2016-03-182-10/+15
| |/ / | | | | | | | | | They would try to load JSON from a project even though it isn't a single project
| * | Merge branch 'improved-issue-sidebar' into 'master' Jacob Schatz2016-03-181-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved issue sidebar Updated the spacing throughout the sidebar so that it fits better on smaller screens. Also adds a more participants button to show any other participants after the first row. Closes #13353 See merge request !3097
| | * | Improved issue sidebarPhil Hughes2016-03-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the spacing throughout the sidebar so that it fits better on smaller screens Added more participants button Closes #13353
| * | | Restrict access to confidential issues on activity feedDouglas Barbosa Alexandre2016-03-171-1/+1
| | | |
| * | | Add eye-slash icon to confidential issuesDouglas Barbosa Alexandre2016-03-171-0/+4
| | | |
| * | | Restrict access for confidential issues on milestone viewDouglas Barbosa Alexandre2016-03-171-1/+1
| | | |
| * | | Fix issues count on project viewDouglas Barbosa Alexandre2016-03-171-1/+1
| |/ /
| * | Merge branch 'edited-text' into 'master' Robert Speicher2016-03-171-1/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited timeago text on comments Unified the 'edited text' to be the same in descriptions and comments Closes #5538 See merge request !3063
| | * | Added skip_js commentedited-textPhil Hughes2016-03-161-0/+1
| | | | | | | | | | | | | | | | [ci skip]
| | * | Fixed failing rubocop testPhil Hughes2016-03-101-5/+5
| | | |
| | * | Fixed issue with timeago not firingPhil Hughes2016-03-101-2/+8
| | | |
| | * | Single if statementPhil Hughes2016-03-101-5/+3
| | | |
| | * | Fixed ruby issues from feedbackPhil Hughes2016-03-101-12/+7
| | | | | | | | | | | | | | | | Fixed failing tests
| | * | Edited timeago text on commentsPhil Hughes2016-03-101-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | Unified the 'edited text' to be the same in descriptions and comments Closes #5538
| * | | Moved code to single line ifPhil Hughes2016-03-171-4/+2
| | | |
| * | | Removed label/milestone helper methodsdropdown-preselect-valuePhil Hughes2016-03-161-18/+8
| | | |
| * | | Fixed failing testsPhil Hughes2016-03-161-1/+2
| | | |
| * | | Pre-selects values on issue and merge request dropdownPhil Hughes2016-03-161-0/+28
| | |/ | |/| | | | | | | Closes #14290
* | | Improve group visibility level featureZeger-Jan van de Weg2016-03-181-2/+1
| | |
View Lorry Controller Status