summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Update projects_helper_specLuke "Jared" Bennett2017-09-281-2/+2
|
* Merge branch '38189-fix-user-avatar-url-cdn' into 'master'Douwe Maan2017-09-251-40/+62
|\ | | | | | | | | | | | | Prevent URL concatenation for avatars Closes #38189 See merge request gitlab-org/gitlab-ce!14437
| * Update tests to reflect `user_avatar_without_link` helper changes38189-fix-user-avatar-url-cdnkushalpandya2017-09-251-40/+62
| |
* | Fixes dashboard/projects empty state showing when viewing personal projectsPhil Hughes2017-09-221-4/+8
|/ | | | | This was caused by the `@projects` value being empty when the current user does not have any personal projects.
* Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-221-0/+19
|
* Merge branch '34259-project-denial-of-service-via-gitmodules-fix' into 'master'Robert Speicher2017-09-191-0/+6
|\ | | | | | | | | | | | | Fixes project denial of service via gitmodules using Extended ASCII. Closes #34259 See merge request gitlab-org/gitlab-ce!14301
| * Fixes project denial of service via gitmodules using Extended ASCII.34259-project-denial-of-service-via-gitmodules-fixTiago Botelho2017-09-151-0/+6
| |
* | Merge branch ↵Douwe Maan2017-09-141-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master' Resolve "Renamed files have escaped HTML for the inline diff in the header" Closes #37576 See merge request gitlab-org/gitlab-ce!14121
| * | changed InlineDiffMarker to make it html_safe its output37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-headermicael.bergeron2017-09-121-2/+2
| | | | | | | | | | | | updated the spec
* | | escape characters in git user nameBrandon Everett2017-09-131-0/+11
| | |
* | | Fix extra space in YAML arrayZeger-Jan van de Weg2017-09-131-1/+1
| | |
* | | AutoDevOps banner hidden on explicit CI configZeger-Jan van de Weg2017-09-131-0/+16
| | | | | | | | | | | | | | | | | | | | | Extends the helper method to no show the banner as soon as the project has a `.gitlab-ci.yml` file on the default branch. Fixes gitlab-org/gitlab-ce#37652
* | | Merge branch 'zj-feature-flipper-disable-banner' into 'master'Kamil Trzciński2017-09-131-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow all AutoDevOps banners to be disabled Closes #37653 See merge request !14218
| * | | Allow all AutoDevOps banners to be disabledZeger-Jan van de Weg2017-09-121-0/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | Given the default in the development and production environment is false, the negation of enabling is used in the flag to signal you'd turn it off. It reads a bit awkward, but makes us have a migration less. Fixes gitlab-org/gitlab-ce#37653
* | | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-2/+28
|/ / | | | | This reverts merge request !14148
* | Merge branch 'user-recent-push' into 'master'Douwe Maan2017-09-111-14/+1
|\ \ | | | | | | | | | | | | | | | | | | Rework how recent push events are retrieved Closes #35990 See merge request !13995
| * | Rework how recent push events are retrieveduser-recent-pushYorick Peterse2017-09-081-14/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever you push to a branch GitLab will show a button to create a merge request (should one not exist already). The underlying code to display this data was quite inefficient. For example, it involved multiple slow queries just to figure out what the most recent push event was. This commit changes the way this data is retrieved so it's much faster. This is achieved by caching the ID of the last push event on every push, which is then retrieved when loading certain pages. Database queries are only executed if necessary and the cached data is removed automatically once a merge request has been created, or 2 hours after being stored. A trade-off of this approach is that we _only_ track the last event. Previously if you were to push to branch A and B then create a merge request for branch B we'd still show the widget for branch A. As of this commit this is no longer the case, instead we will only show the widget for the branch you pushed to most recently. Once a merge request exists the widget is no longer displayed. Alternative solutions are either too complex and/or too slow, hence the decision was made to settle for this trade-off. Performance Impact ------------------ In the best case scenario (= a user didn't push anything for more than 2 hours) we perform a single Redis GET per page. Should there be cached data we will run a single (and lightweight) SQL query to get the event data from the database. If a merge request already exists we will run an additional DEL to remove the cache key. The difference in response timings can vary a bit per project. On GitLab.com the 99th percentile of time spent in User#recent_push hovers between 100 milliseconds and 1 second, while the mean hovers around 50 milliseconds. With the changes in this MR the expected time spent in User#recent_push is expected to be reduced down to just a few milliseconds. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/35990
* | Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-081-28/+2
| | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* | Merge branch 'fix-escape-commit-block' into 'security-9-5'Douwe Maan2017-09-071-0/+22
|/ | | | | [9.5] Prevent a persistent XSS in the commit author block See merge request gitlab/gitlabhq!2180
* Merge branch 'improve-share-locking-feature-for-subgroups' into 'master'Douwe Maan2017-09-071-0/+93
|\ | | | | | | | | | | | | Improve "Share with group lock" feature for subgroups Closes #30550 See merge request !13944
| * Refer to “Share with group lock” consistentlyimprove-share-locking-feature-for-subgroupsMichael Kozono2017-09-061-5/+5
| |
| * Link or not link depending on permissionsMichael Kozono2017-09-061-3/+13
| |
| * Link to ancestor settings pageMichael Kozono2017-09-061-3/+3
| |
| * Fix “Share lock” help textMichael Kozono2017-09-061-0/+83
| |
* | Merge branch '37158-autodevops-banner' into 'master'Kamil Trzciński2017-09-071-0/+59
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Banner to enable Auto DevOps at project level" Closes #37158 See merge request !13991
| * \ Merge branch 'zj/gitlab-ce-zj-auto-devops-table' into 37158-autodevops-bannerKamil Trzcinski2017-09-071-2/+28
| |\ \
| * \ \ Merge branch 'zj-auto-devops-table' of gitlab.com:zj/gitlab-ce into ↵Kamil Trzcinski2017-09-071-8/+18
| |\ \ \ | | | | | | | | | | | | | | | 37158-autodevops-banner
| * | | | Add specs for AutoDevopsHelperKamil Trzcinski2017-09-061-0/+59
| | |_|/ | |/| |
* | | | Merge branch '31362_decrease_cyclomatic_complexity_threshold_step3' into ↵Rémy Coutable2017-09-071-4/+25
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 'master' Decrease Cyclomatic Complexity threshold to 14 See merge request !13972
| * | | remove unnecessary args from `link_to_member_avatar` method in ↵Maxim Rydkin2017-09-071-6/+4
| | | | | | | | | | | | | | | | `app/helpers/projects_helper.rb`
| * | | fix project_helper.rb and add couple specs to itMaxim Rydkin2017-09-071-2/+14
| | | |
| * | | fix CIMaxim Rydkin2017-09-071-1/+1
| | | |
| * | | fix helper and specMaxim Rydkin2017-09-071-5/+8
| | | |
| * | | refactor `app/helpers/projects_helper.rb:21:3`Maxim Rydkin2017-09-071-1/+9
| | |/ | |/|
* | | Merge branch ↵Sean McGivern2017-09-071-2/+28
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
| * | Small refactor after last code review.35012-navigation-add-option-to-change-navigation-color-paletteRuben Davila2017-09-071-3/+3
| | |
| * | Use indigo as default themeAnnabel Dunstone Gray2017-09-071-2/+2
| | |
| * | Fix specs; start on light themeAnnabel Dunstone Gray2017-09-061-2/+2
| | |
| * | Restore some changes from !9199Rubén Dávila2017-09-061-0/+26
| |/
* | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-061-8/+18
|/
* Merge branch ↵Douwe Maan2017-09-061-6/+85
|\ | | | | | | | | | | | | | | | | '34509-improves-markdown-rendering-performance-for-commits-list' into 'master' Resolve "Projects::CommitsController#show is slow partially due to SQL queries" Closes #34509 See merge request !13762
| * Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-061-6/+85
| |
* | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-061-6/+6
|\ \ | | | | | | | | | | | | | | | | | | First time contributor badge Closes #35161 See merge request !13902
| * | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-061-71/+6
| | | | | | | | | | | | | | | | | | | | | this will remove the need make N queries (per-note) at the cost of having to mark notes with an attribute this opens up the possibility for other special roles for notes
| * | fix #35161, add a first-time contributor badgemicael.bergeron2017-09-061-0/+65
| |/ | | | | | | | | | | | | | | | | a new badge will be added when an user that doesn't yet have any merged merge request is discussing on either issues or merge requests that he created. this is indented for people to use extra care when discussing with a new contributor.
* | Merge branch '35441-fix-division-by-zero' into 'master'Robert Speicher2017-09-061-10/+17
|\ \ | | | | | | | | | | | | | | | | | | Fix division by zero for blame age map Closes #35441 See merge request !13803
| * | Refactor blame helper age class testsJeff Stubler2017-09-051-22/+15
| | |
| * | Fix division by zero for blame age mapJeff Stubler2017-08-241-1/+15
| | |
* | | Merge branch 'generalize-profile-updates' into 'master'Douwe Maan2017-09-061-6/+25
|\ \ \ | | | | | | | | | | | | | | | | Profile updates from providers See merge request !12968
| * | | Profile updates from providersAlexander Keramidas2017-09-061-6/+25
| | |/ | |/|