summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |/ | |/|
* | | Merge branch 'breadcrumbs-improvements' into 'master'Filipa Lacerda2017-09-061-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Improvements to breadcrumbs Closes #35269 and #36460 See merge request !13582
| * | removed comment from helper specPhil Hughes2017-09-051-1/+0
| | |
| * | Merge branch 'master' into breadcrumbs-improvementsPhil Hughes2017-09-051-10/+0
| |\ \
| * | | rspec test fixesPhil Hughes2017-09-041-1/+3
| | | |
* | | | Merge branch ↵Douwe Maan2017-09-061-1/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments' into 'master' Add setting to collapse outdated diff comments on push Closes #36994 See merge request !14053
| * | | | Resolve outdated diff discussions on pushSean McGivern2017-09-061-1/+19
| | |/ / | |/| |
* | | | Merge branch ↵Rémy Coutable2017-09-061-2/+18
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '19650-remove-admin-section-from-search-results-if-user-doesnt-have-access' into 'master' Hide admin link from default search results for non-admins Closes #19650 See merge request !14015
| * | | Hide admin link from default search results for non-adminsMark Fletcher2017-09-061-2/+18
| | | |
* | | | Merge branch 'remove-unused-code-issueshelper' into 'master'Rémy Coutable2017-09-041-10/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Remove unused methods from `IssuesHelper` and `IssuablesHelper` See merge request !13793
| * | | Remove unused `IssuesHelper#merge_requests_sentence`Mehdi Lahmam2017-08-241-10/+0
| | |/ | |/| | | | | | | Its last usage has been removed at eb3e7bdfd8.
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJose Ivan Vargas2017-09-031-106/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'remove-finder-caching' into 'master'Robert Speicher2017-09-011-106/+0
| |\ \ | | | | | | | | | | | | | | | | Remove issuable finder count caching See merge request !13959
| | * | Remove issuable finder count cachingSean McGivern2017-08-311-106/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to cache the total open count separately, and then just perform these counts on the list. We already do that to get the pagination information, through Kaminari, and a future change will make Kaminari reuse the query results from earlier in the request.
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2017-09-012-16/+63
|\ \ \ \ | |/ / /
| * | | Merge branch ↵Tim Zallmann2017-08-311-14/+61
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-public' into 'master' Resolve various visibility level settings issues Closes #31273 See merge request !13442
| | * | | enhance disabled group visibility options with links and instructionsMike Greiling2017-08-301-2/+2
| | | | |
| | * | | update test to match new disabled option descriptionMike Greiling2017-08-301-1/+1
| | | | |
View Lorry Controller Status