summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added & use Gitlab::Routing for URL helpersroutingYorick Peterse2016-04-0120-21/+34
| | | | | | | Rails' "url_helpers" method creates an anonymous Module (which a bunch of methods) on every call. By caching the output of this method in a dedicated method we can shave off about 10 seconds of loading time for an issue with around 200 comments.
* Merge branch 'clean-up-user-controller-spec' into 'master' Robert Speicher2016-03-311-12/+3
|\ | | | | | | | | | | | | Minor clean up on admin/users_controller_spec Extracted from !3439 See merge request !3460
| * Minor clean up on admin/users_controller_specZeger-Jan van de Weg2016-03-311-12/+3
| |
* | Merge branch 'fix-input-borders' into 'master' Jacob Schatz2016-03-314-8/+10
|\ \ | | | | | | | | | | | | | | | | | | Fix input borders See merge request !3474
| * | Use border color variables for inputfix-input-bordersDmitriy Zaporozhets2016-03-312-3/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix icons color in the headerfix-header-colorsDmitriy Zaporozhets2016-03-313-5/+6
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'deleted-project-still-stays-visible-and-404-issue-14138' into ↵Robert Speicher2016-03-317-12/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Exclude projects pending deletion from all results Closes #14138 See merge request !3439
| * | | Exclude projects pending deletion from all resultsZeger-Jan van de Weg2016-03-317-12/+33
|/ / /
* | | Merge branch 'fix-todos' into 'master' Rémy Coutable2016-03-317-2/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroy related todos when an Issue/MR is deleted Closes #14550 Closes #14598 See merge request !3376
| * | | Update CHANGELOGfix-todosDouglas Barbosa Alexandre2016-03-311-0/+4
| | | |
| * | | Remove todos for deleted merge requestsDouglas Barbosa Alexandre2016-03-312-1/+18
| | | |
| * | | Destroy related todos when an issue is deletedDouglas Barbosa Alexandre2016-03-304-1/+20
| | | |
| * | | Fix error 500 when target is nil on todo listDouglas Barbosa Alexandre2016-03-301-1/+4
| | | |
* | | | Merge branch 'fix-placeholder-color' into 'master' Jacob Schatz2016-03-311-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Fix placeholder color Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3472
| * | | Fix placeholder colorDmitriy Zaporozhets2016-03-311-1/+1
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix-event-row' into 'master' Jacob Schatz2016-03-312-1/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-312-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'issue_3400_port' into 'master' Jacob Schatz2016-03-3111-157/+613
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2961-533/+1347
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/gl_dropdown.js.coffee
| * | | | Remove unused CSSAlfredo Sumaran2016-03-282-27/+5
| | | | |
| * | | | Hide suggestions when deleting all input value using other than backspaceAlfredo Sumaran2016-03-271-2/+6
| | | | |
| * | | | Do not show dropdown menu if when no suggestions returnedAlfredo Sumaran2016-03-271-4/+5
| | | | |
| * | | | Add option to submit the typed queryAlfredo Sumaran2016-03-271-0/+10
| | | | |
| * | | | Fix broken specAlfredo Sumaran2016-03-271-5/+4
| | | | |
| * | | | Initialize autocomplete only when search form is presentAlfredo Sumaran2016-03-261-2/+3
| | | | |
| * | | | Fix SCSS Lint errorsAlfredo Sumaran2016-03-262-2/+2
| | | | |
| * | | | Always display suggestionsAlfredo Sumaran2016-03-263-25/+20
| | | | |
| * | | | Merge branch 'master' into issue_3400_portAlfredo Sumaran2016-03-2638-683/+249
| |\ \ \ \
| * | | | | Makes autocomplete dropdown look the same as othersAlfredo Sumaran2016-03-256-25/+62
| | | | | |
| * | | | | Use separators between categoriesAlfredo Sumaran2016-03-241-1/+1
| | | | | |
| * | | | | Add separator as a line dividerAlfredo Sumaran2016-03-241-1/+4
| | | | | |
| * | | | | Use strings instead of constantsAlfredo Sumaran2016-03-241-31/+25
| | | | | |
| * | | | | Make form width the same as dropdown widthAlfredo Sumaran2016-03-243-2/+4
| | | | | |
| * | | | | Adjust menu positioningAlfredo Sumaran2016-03-241-0/+6
| | | | | |
| * | | | | Add separator at the end of categoriesAlfredo Sumaran2016-03-241-0/+5
| | | | | |
| * | | | | Prevent creating autocomplete dropdown is user is not logged inAlfredo Sumaran2016-03-241-1/+5
| | | | | |
| * | | | | Fixes overlapping on SafariAlfredo Sumaran2016-03-241-1/+5
| | | | | |
| * | | | | Increase time because of SafariAlfredo Sumaran2016-03-241-1/+1
| | | | | |
| * | | | | Add param to skip enterCallbackAlfredo Sumaran2016-03-232-1/+4
| | | | | |
| * | | | | Make sure we are looking inside dropdpown wrapperAlfredo Sumaran2016-03-231-1/+1
| | | | | |
| * | | | | Fix input referenceAlfredo Sumaran2016-03-231-1/+1
| | | | | |
| * | | | | Pass proper input elementAlfredo Sumaran2016-03-231-4/+1
| | | | | |
| * | | | | Merge branch 'master' into issue_3400_portAlfredo Sumaran2016-03-23256-1525/+6900
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/gl_dropdown.js.coffee
| * | | | | | Change key name to match input IdAlfredo Sumaran2016-03-231-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes input not being restored with its original value
| * | | | | | Fixes removing the location badge with backspace on the last characterAlfredo Sumaran2016-03-231-4/+19
| | | | | | |
| * | | | | | Prevents unwanted menu togglingAlfredo Sumaran2016-03-231-3/+3
| | | | | | |
| * | | | | | Remove unused instance variableAlfredo Sumaran2016-03-231-14/+3
| | | | | | |
| * | | | | | Restore menu content when emptying the search inputAlfredo Sumaran2016-03-231-0/+11
| | | | | | |
| * | | | | | Fixes empty menu when typing on search input for the very first timeAlfredo Sumaran2016-03-232-51/+69
| | | | | | |
| * | | | | | Set constants for category namesAlfredo Sumaran2016-03-211-27/+32
| | | | | | |
View Lorry Controller Status