summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diffDouwe Maan2017-10-021-7/+9
|
* Fixed missing namespaces on navigation translationsfix-translation-namespacesPhil Hughes2017-09-271-1/+1
|
* Merge branch '38189-fix-user-avatar-url-cdn' into 'master'Douwe Maan2017-09-251-9/+16
|\ | | | | | | | | | | | | Prevent URL concatenation for avatars Closes #38189 See merge request gitlab-org/gitlab-ce!14437
| * Add `data-src` when image is to be lazy loaded, use `tag` helper instead of ↵kushalpandya2017-09-251-9/+16
| | | | | | | | `image_tag` helper
* | Merge branch 'improve_sorting_list' into 'master'Douwe Maan2017-09-251-131/+173
|\ \ | | | | | | | | | | | | | | | | | | Improve list of sorting options Closes #36929 See merge request gitlab-org/gitlab-ce!14320
| * | Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-231-131/+173
| |/
* | Merge branch 'project-page-clearer' into 'master'Filipa Lacerda2017-09-251-2/+2
|\ \ | |/ |/| | | | | | | | | Add context tabs to dashboard/projects Closes #29045 See merge request gitlab-org/gitlab-ce!14364
| * Fixes dashboard/projects empty state showing when viewing personal projectsPhil Hughes2017-09-221-2/+2
| | | | | | | | | | This was caused by the `@projects` value being empty when the current user does not have any personal projects.
* | Merge branch 'dm-group-share-lock-default-help' into 'master'Rémy Coutable2017-09-221-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Inform user that current shared projects will remain shared Closes #38220 See merge request gitlab-org/gitlab-ce!14441
| * | Inform user that current shared projects will remain shareddm-group-share-lock-default-helpDouwe Maan2017-09-221-1/+1
| | |
* | | Make branches page translatableWinnie Hellmann2017-09-221-27/+27
| |/ |/|
* | Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-223-27/+33
| |
* | Merge branch 'add-view-replaced-file-link' into 'master'Rémy Coutable2017-09-221-2/+4
|\ \ | |/ |/| | | | | Add view replaced file link for image diffs See merge request gitlab-org/gitlab-ce!14394
| * Add view replaced file link for image diffsadd-view-replaced-file-linkClement Ho2017-09-201-2/+4
| |
* | Merge branch 'add_tooltip_for_milestone_in_issues_list' into 'master'Douwe Maan2017-09-201-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Add tooltip for milestone due date to issue and merge request lists Closes #18864 See merge request gitlab-org/gitlab-ce!14318
| * | Add tooltip for milestone due date to issue and merge request listsVitaliy @blackst0ne Klachkov2017-09-201-0/+6
| |/
* | Improve after code-reviewKamil Trzcinski2017-09-191-2/+2
| |
* | Add warning message if domain or cluster are not configuredbokebilly2017-09-191-1/+20
| |
* | Merge branch '34259-project-denial-of-service-via-gitmodules-fix' into 'master'Robert Speicher2017-09-191-4/+8
|\ \ | |/ |/| | | | | | | | | 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-4/+8
| |
* | Merge branch 'revert-sidebar-title-attribute' into 'master'Filipa Lacerda2017-09-151-4/+0
|\ \ | | | | | | | | | | | | Remove title attribute from sidebar elements See merge request gitlab-org/gitlab-ce!14140
| * | Remove title attribute from sidebar elementsPhil Hughes2017-09-131-4/+0
| | |
* | | Fixed width of sub-group in breadcrumb dropdownsub-group-dropdown-widthPhil Hughes2017-09-131-3/+3
| | | | | | | | | | | | Closes #37745
* | | Merge branch 'ce-backport-new-sidebar-boards' into 'master'Filipa Lacerda2017-09-131-0/+4
|\ \ \ | |/ / |/| | | | | | | | CE backport of new-sidebar-boards See merge request !14246
| * | CE backport of new-sidebar-boardsce-backport-new-sidebar-boardsPhil Hughes2017-09-131-0/+4
| | |
* | | escape characters in git user nameBrandon Everett2017-09-131-1/+1
| | |
* | | AutoDevOps banner hidden on explicit CI configZeger-Jan van de Weg2017-09-131-1/+3
|/ / | | | | | | | | | | | | 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-1/+2
|\ \ | | | | | | | | | | | | | | | | | | 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-1/+2
| |/ | | | | | | | | | | | | | | 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
* | Merge branch ↵Grzegorz Bizon2017-09-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '36907-new-issue-from-failed-build-no-longer-links-to-failed-build' into 'master' Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request !13790
| * | Fixed the URL + renamed to Job FailedTim Zallmann2017-09-121-1/+1
| |/
* | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-0/+4
|/ | | This reverts merge request !14148
* Merge branch 'user-recent-push' into 'master'Douwe Maan2017-09-111-9/+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-9/+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
* | Remove confidential toggle checkbox and related code as no longer necessary37454-remove-confidential-cb-edit-issuekushalpandya2017-09-111-1/+0
| |
* | Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-081-4/+0
| | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* | Merge branch 'bugfix/graph-friendly-notes-number' into 'master'Rémy Coutable2017-09-081-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Print notes number explained in the graph. Closes #37224 See merge request !13949
| * | Print notes number explained.Vladislav Kaverin2017-09-081-1/+2
| | | | | | | | | | | | | | | | | | Printing just `[<number>]` was confusing - it looks like a ghost branch or something. Add `note` (or `notes`, depending on number of notes) to give some details of what this number means. Refactor code to follow DRY principle.
* | | Merge branch ↵Rémy Coutable2017-09-081-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | '37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree' into 'master' Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree Closes #37569 See merge request !14119
| * | Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_treeRémy Coutable2017-09-071-1/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'fix-escape-commit-block' into 'security-9-5'Douwe Maan2017-09-071-3/+3
| |/ |/| | | | | | | [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/+59
|\ \ | | | | | | | | | | | | | | | | | | 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-4/+4
| | |
| * | Add missing .html_safesWinnie Hellmann2017-09-061-3/+3
| | |
| * | Link or not link depending on permissionsMichael Kozono2017-09-061-8/+16
| | |
| * | Link to ancestor settings pageMichael Kozono2017-09-061-1/+7
| | |
| * | Fix “Share lock” help textMichael Kozono2017-09-061-14/+27
| | |
| * | Simplify disabling checkboxMichael Kozono2017-09-061-8/+4
| | |
| * | Make texts translatableWinnie Hellmann2017-09-061-4/+8
| | |
| * | Vary share lock setting UIMichael Kozono2017-09-061-0/+32
| | | | | | | | | | | | …based on whether the current user owns the parent group and whether the parent group or current group is share locked.