summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Shows error messages when trying to create label in dropdown menulabel-dropdown-errorsPhil Hughes2016-03-222-1/+13
| | | | Closes #14495
* Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master' Jacob Schatz2016-03-213-3/+3
|\ | | | | | | | | | | | | 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-203-3/+3
| |
* | Merge branch 'remove-console-log' into 'master' Jacob Schatz2016-03-211-1/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove console.log call See merge request !3322
| * | Remove console.log callStan Hu2016-03-201-1/+0
| |/
* | Merge branch 'feature/issue-move' into 'master' Kamil Trzciński2016-03-211-1/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+43
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1910-83/+213
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-4/+4
| | | | |
| * | | | Use helper to create list of projects issue can be moved toGrzegorz Bizon2016-03-171-1/+10
| | | | | | | | | | | | | | | | | | | | This also adds confirmation message if issue move has been requested.
| * | | | Revert changes in js used to create project selectGrzegorz Bizon2016-03-171-50/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will preserve those changes in history, we may need them in future. Currently we will use a issues helpers to create options to choose project whem moving issue to it.
| * | | | Add initial notifications and hooks for issue moveGrzegorz Bizon2016-03-171-6/+0
| | | | |
| * | | | Make it possible to exclude project in projects selectGrzegorz Bizon2016-03-171-6/+21
| | | | |
| * | | | Add access-level filter support for projects selectGrzegorz Bizon2016-03-171-18/+38
| | | | | | | | | | | | | | | | | | | | This also refactores ProjectSelect adding some decorator-like functions.
| * | | | Add ability to choose id attribute in project select helperGrzegorz Bizon2016-03-171-2/+3
| | | | |
* | | | | Merge branch 'fix-image-mode-view-diff' into 'master' Dmitriy Zaporozhets2016-03-211-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diff image view modes (2-up, swipe, onion skin) not working Example test case: https://gitlab.com/mrtzcspr/test/commit/5d983226b1308d98ef3d8919b978ad49f34496b8 Closes #13856 See merge request !3316
| * | | | Fix diff image view modes (2-up, swipe, onion skin) not workingStan Hu2016-03-191-0/+1
| | |/ / | |/| | | | | | | | | | Closes #13856
* | | | Merge branch 'fix-default-http-clone' into 'master' Jacob Schatz2016-03-201-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make HTTP(s) label consistent on clone bar Sites that use http:// for the external_url should always display HTTP on the clone bar. Similarly, sites that use https:// should show HTTPS. Currently, the inconsistency looks like: ![http-magic](/uploads/945fda580f7ba5aee36cc572b49baf2b/http-magic.gif) Also restores the tooltips that vanished in 7ba4482fcf6: ![image](/uploads/b5a7b3e68b4992a447fcaa51915e866c/image.png) See merge request !3319
| * | | | Fix specs and remove unnecessary console.logStan Hu2016-03-201-1/+0
| | |_|/ | |/| |
* | | | Merge branch 'edit-form-alignment' into 'master' Jacob Schatz2016-03-201-6/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing below edit note form Also changed to allow the CSS to decide what should be hidden when editing Thanks @JobV for having eagle eyes :stuck_out_tongue_winking_eye: See merge request !3306
| * | | | Fix spacing below edit note formedit-form-alignmentPhil Hughes2016-03-181-6/+2
| | | | | | | | | | | | | | | | | | | | Also changed to allow the CSS to decide what should be hidden when editting
* | | | | Merge branch 'rs-auto-expand-sidebar' into 'master' Jacob Schatz2016-03-201-3/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand the issuable sidebar when coming back from the Changes tab Unless the user explicitly requested the collapsed sidebar. Fixes: #14353 See merge request !3256
| * | | | | Expand the issuable sidebar when coming back from the Changes tabrs-auto-expand-sidebarRobert Speicher2016-03-171-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | Unless the user explicitly requested the collapsed sidebar.
* | | | | | Merge branch 'dropdown-persits-filtered-data' into 'master' Jacob Schatz2016-03-201-1/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with filtered data persisting when dropdown closed ![labels](/uploads/4b9c902add76263d8488cc34ef49f142/labels.gif) Closes #14401 See merge request !3302
| * | | | | Fixed issue with filtered data persisting when dropdown closeddropdown-persits-filtered-dataPhil Hughes2016-03-181-1/+5
| | |/ / / | |/| | | | | | | | | | | | | Closes #14401
* | | | | Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-1830-259/+1236
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fixes issue with filter label missing on labels & milestonesPhil Hughes2016-03-183-3/+3
| | | | |
| * | | | Fixed issue with labels dropdown getting wrong labelsPhil Hughes2016-03-182-18/+0
| |/ / /
| * | | Merge branch 'fix-mr-close-button' into 'master' Jacob Schatz2016-03-181-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with close button not working on MR Closes #14383 See merge request !3295
| | * | | Fixes issue with close button not working on MRfix-mr-close-buttonPhil Hughes2016-03-181-2/+2
| | |/ / | | | | | | | | | | | | Closes #14383
| * | | Merge branch 'improved-issue-sidebar' into 'master' Jacob Schatz2016-03-181-0/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Removed global JS varimproved-issue-sidebarPhil Hughes2016-03-181-4/+5
| | | | |
| | * | | Reused some variablesPhil Hughes2016-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | Set global JS variable to sync view up
| | * | | Improved issue sidebarPhil Hughes2016-03-181-0/+24
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Updated the spacing throughout the sidebar so that it fits better on smaller screens Added more participants button Closes #13353
| * | | Another CS style fixissue-fade-loadPhil Hughes2016-03-181-1/+1
| | | |
| * | | Fixed some CS styling issuesPhil Hughes2016-03-184-74/+85
| | | | | | | | | | | | | | | | Fixed bug where wouldn't work on MR index
| * | | Fixed issue with dashboard issues not reloadingPhil Hughes2016-03-183-4/+17
| | | |
| * | | Changing filter dropdowns shows loadingPhil Hughes2016-03-185-15/+42
| | | | | | | | | | | | | | | | Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well
| * | | Merge branch 'optimistic-todos' into 'master' Jacob Schatz2016-03-182-1/+58
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds small AJAX optimistic functionality to todos. Fixes #13656 <br/> A good first step and boring solution. <br/> Will make ajax call to remove each issue. <br/> If issue is last in group of issues will refresh page. <br/> If issues remain in group will remove row with JS. <br/> Adds loading spinner to button and disables. <br/> ![todos-optimistic](/uploads/c6aec4a688e5125d4df55a2a3a55d4d7/todos-optimistic.gif) <br/> cc @dzaporozhets @JobV @dbalexandre See merge request !2946
| | * | | Mark all as done through AJAXPhil Hughes2016-03-171-5/+26
| | | | |
| | * | | Removed the flash success messagePhil Hughes2016-03-171-32/+20
| | | | | | | | | | | | | | | | | | | | Removes the group if empty
| | * | | Remove `Flash` from todos when finishedJacob Schatz2016-03-171-1/+0
| | | | |
| | * | | Adds small AJAX optimistic functionality to todos.Jacob Schatz2016-03-172-1/+50
| | | |/ | | |/| | | | | | | | | | | | | Fixes #13656 A good first step and boring solution.
| * | | Changed any variable name to save confusionPhil Hughes2016-03-181-2/+2
| | | |
| * | | Removed comparing against textPhil Hughes2016-03-181-1/+2
| | | |
| * | | Fixes issue with any milestone value in dropdown not being selectablePhil Hughes2016-03-181-1/+1
| | |/ | |/| | | | | | | Closes #14293
| * | Merge branch 'edited-text' into 'master' Robert Speicher2016-03-171-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited timeago text on comments Unified the 'edited text' to be the same in descriptions and comments Closes #5538 See merge request !3063
| | * | Edited timeago text on commentsPhil Hughes2016-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Unified the 'edited text' to be the same in descriptions and comments Closes #5538
| * | | Merge branch 'hide-builds-feature' into 'master' Robert Speicher2016-03-171-0/+13
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Hide builds from Project's settings when the feature is disabled Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/13944 See merge request !3220
| | * | Hide builds from Project's settings when the feature is disabledhide-builds-featureKamil Trzcinski2016-03-151-0/+13
| | | |
View Lorry Controller Status