summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Fix todo_target_path for todos where target was removedfix-todo-target-pathDouglas Barbosa Alexandre2016-04-121-0/+2
|
* Merge branch 'issue_14206' into 'master' Jacob Schatz2016-04-121-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix datetimes on tooltips Closes #14206 Updates tooltip datetimes on `.timeago()` instances. **Inline notes** ![Screen_Shot_2016-04-07_at_1.25.12_PM](/uploads/2f55390a7e91dabf75e71fe3bda91849/Screen_Shot_2016-04-07_at_1.25.12_PM.png) **Existing and new notes** ![Screen_Shot_2016-04-07_at_1.24.49_PM](/uploads/202bb7476738eb048f2d94abb68174e7/Screen_Shot_2016-04-07_at_1.24.49_PM.png) **Issuable dates** ![Screen_Shot_2016-04-07_at_1.24.32_PM](/uploads/80fd5cc3c06fade0b1c615bc7b7611a8/Screen_Shot_2016-04-07_at_1.24.32_PM.png) **Build dates** ![Screen_Shot_2016-04-07_at_1.25.02_PM](/uploads/832f43284005ea610a3ad54a49b97104/Screen_Shot_2016-04-07_at_1.25.02_PM.png) See merge request !3497
| * Merge branch 'master' into issue_14206issue_14206Alfredo Sumaran2016-04-116-43/+50
| |\
| * | Convert time param to TimeAlfredo Sumaran2016-04-071-1/+1
| | |
* | | Updated based on Ruby feedbackPhil Hughes2016-04-121-1/+1
| | |
* | | Updated RubyPhil Hughes2016-04-121-3/+6
| | | | | | | | | | | | Added CHANGELOG item
* | | Updated based on Ruby feedbackPhil Hughes2016-04-121-2/+2
| | |
* | | Updated testsPhil Hughes2016-04-121-1/+1
| | |
* | | Project dropdown in header uses new dropdownPhil Hughes2016-04-121-12/+2
| | |
* | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-121-34/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple membership and notifications This allow you to have notification setting per project even if you are member of group. It also creates background for having notification settings in project you are not member of. - [x] Make it work - [x] Migrations - [x] CHANGELOG - [x] More tests - [x] API For #3359 After this merge request there is still some work to be done: * create migration that remove duplicates in notification settings table and create uniq index (8.8 probably) * remove notification_level field from Member model in 9.0 * make proper API for notification settings * use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) * maybe more tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3421
| * \ \ Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-116-43/+50
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-083-30/+39
| |\ \ \ | | | |/ | | |/|
| * | | Refactor notification helper and fix notification serviceDmitriy Zaporozhets2016-03-301-8/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Small refactoring and cleanup of notification logicDmitriy Zaporozhets2016-03-301-10/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Introduce NotificationSetting to user interfaceDmitriy Zaporozhets2016-03-301-31/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * visiting project will create notification setting if missing * change notification setting per project even without membership * use notification settings instead of membership on profile page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | hide help block when user is creating a new project inside a groupArinde Eniola2016-04-121-2/+10
| | | |
* | | | Merge branch 'issue_1752' into 'master' Robert Speicher2016-04-111-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix milestone removal problem when editing issues fixes #1752 See merge request !3571
| * | | Fix milestone removal problem when editing issuesFelipe Artur2016-04-061-0/+1
| | |/ | |/|
* | | Merge branch 'rs-form_errors' into 'master' Dmitriy Zaporozhets2016-04-111-0/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize the way we check for and display form errors - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard. See merge request !3531
| * | | Standardize the way we check for and display form errorsrs-form_errorsRobert Speicher2016-04-041-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard.
* | | | Merge branch 'mr-ui-update' into 'master' Jacob Schatz2016-04-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated UI for new merge request Closes #2540 ![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png) ![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png) See merge request !3228
| * | | | Updated UI for new merge requestPhil Hughes2016-04-061-2/+2
| | |/ / | |/| | | | | | | | | | Closes #2540
* | | | Remove `random_markdown_tip` helperrs-remove-markdown-tipsRobert Speicher2016-04-091-23/+0
| | | | | | | | | | | | | | | | Only usage got removed in !3442
* | | | Merge branch '14400-diff-redesign' into 'master' Jacob Schatz2016-04-093-9/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff redesign Fixes #14400 Fixes #13500 ![diffs_redesign](/uploads/16da9557e497114d886ef5ece2f306b3/diffs_redesign.gif) See merge request !3476
| * | | | Fix lint errorsAnnabel Dunstone2016-04-071-4/+2
| | | | |
| * | | | Diff design updatesAnnabel Dunstone2016-04-073-8/+8
| | | | |
| * | | | Update diff colors and iconsAnnabel Dunstone2016-04-071-1/+2
| | | | |
| * | | | Change reply button to text fieldAnnabel Dunstone2016-04-071-5/+3
| |/ / /
* | | | Add "sprite" parameter to emoji_icon helperconnorshea2016-04-081-9/+24
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emoji_icon helper used to display the award emoji in Issue and Merge Request views. By default the spritesheet is used, but passing `sprite: false` to the `emoji_icon` helper makes the emoji render as separate images. For award emoji displayed by default (e.g. thumbs-up, thumbs-down, and any that have been awarded to the issue/MR) the independent images are used. Only when the full emoji menu is opened does the full spritesheet load. On a normal issue this change decreases the page load by 670KB or 250KB depending on pixel density. Resolves #14334.
* | | Fix event rendering when create projectfix-ui-eventDmitriy Zaporozhets2016-04-041-1/+1
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-4/+0
| | | | | | | | | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
* | Merge branch 'fix-event-row' into 'master' Jacob Schatz2016-03-311-0/+8
|\ \ | | | | | | | | | | | | | | | | | | Fix event rendering for certain event types Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3469
| * | Fix event rendering for certain event typesDmitriy Zaporozhets2016-03-311-0/+8
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'issue_3400_port' into 'master' Jacob Schatz2016-03-311-26/+31
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Location aware search Closes #3400 #14217 Introduces suggestion grouping on the search box and adds the ability to the user to remove the location to search on. **Notes** - Suggestions are now grouped by category. - Suggestions are displayed when no location is set. - Would be great to provide suggestions for the specified location which could be a project or group. - A location is set from the server for projects/groups related urls. **Default Apparence** ![](/uploads/9fad1a354fb0e4b13cfd36698c061ab4/default.gif) **When location badge is present** ![](/uploads/ddc6379f407061e188f9f4a7a9a8c9b8/location-badge.gif) **Suggestions** ![suggestions](/uploads/2df288e00ad496b31a1a2efc2a4a9f6d/suggestions.gif) **Suggestions when location badge is present** ![](/uploads/f6ef09d3aed124179ab4e228b848486e/location-present-suggestions.gif) Closes #3400 See merge request !3212
| * Merge branch 'master' into issue_3400_portissue_3400_portAlfredo Sumaran2016-03-292-1/+11
| |\ | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/gl_dropdown.js.coffee
| * \ Merge branch 'master' into issue_3400_portAlfredo Sumaran2016-03-262-2/+4
| |\ \
| * | | Use strings instead of constantsAlfredo Sumaran2016-03-241-31/+25
| | | |
| * | | Merge branch 'master' into issue_3400_portAlfredo Sumaran2016-03-239-13/+51
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/gl_dropdown.js.coffee
| * | | | Set constants for category namesAlfredo Sumaran2016-03-211-27/+32
| | | | |
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Alfredo Sumaran2016-03-214-22/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | issue_3400_port
| * \ \ \ \ Merge branch 'master' into issue_3400_portAlfredo Sumaran2016-03-182-21/+0
| |\ \ \ \ \
| * | | | | | Better wordingAlfredo Sumaran2016-03-181-2/+2
| | | | | | |
| * | | | | | Apply styling and tweaks to autocomplete dropdownAlfredo Sumaran2016-03-181-11/+10
| | | | | | |
| * | | | | | Working version of autocomplete with categorized resultsAlfredo Sumaran2016-03-181-26/+33
| | | | | | |
* | | | | | | Merge branch 'added-milestone-upcoming' into 'master' Rémy Coutable2016-03-301-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdown bug fixes - Added back upcoming to milestone filter ![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png) - Fixed bug that would cause the currently selected value to disappear on filters - Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past Closes #14536 See merge request !3368
| * | | | | | | Updated based on Ruby feedbackPhil Hughes2016-03-291-1/+1
| | | | | | | |
| * | | | | | | Ruby fixesPhil Hughes2016-03-291-11/+4
| | | | | | | |
| * | | | | | | Fixed rubocop issuesPhil Hughes2016-03-291-5/+6
| | | | | | | |
| * | | | | | | Standardised the output of the JSON to always include the namePhil Hughes2016-03-291-0/+14
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | The frontend will then always use the name as the ID - like previous
* | | | | | | Merge branch 'fix-mr-comment-commit-pruned' into 'master' Robert Speicher2016-03-291-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gracefully handle notes on deleted commits in merge requests Closes #3250 See merge request !3402