summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Eager load namespace owners for project dashboardsdashboards-projects-controllerYorick Peterse2017-09-112-1/+6
| | | | | This solves an N+1 query problem where we'd run multiple queries when getting the namespace owners of the displayed projects.
* Merge branch 'user-recent-push' into 'master'Douwe Maan2017-09-1113-86/+369
|\ | | | | | | | | | | | | Rework how recent push events are retrieved Closes #35990 See merge request !13995
| * Rework how recent push events are retrieveduser-recent-pushYorick Peterse2017-09-0813-86/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'feature/gpg-verification-status-remove-ignore-rule' into 'master'Douwe Maan2017-09-111-3/+0
|\ \ | | | | | | | | | | | | Remove ignore rule for GpgSignature#valid_signature See merge request !14050
| * | Revert "make valid_signature an ignored column"Alexis Reigel2017-09-051-3/+0
| | | | | | | | | | | | This reverts commit cce9afa38a8aa3f3e5a43ab952e1c022c9dd9385.
* | | Merge branch '37603-preferences-settings-extra-line' into 'master'Phil Hughes2017-09-111-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unused extra hr in preferences Closes #37603 See merge request !14127
| * | | Remove unused extra hr in preferences37603-preferences-settings-extra-lineAnnabel Dunstone Gray2017-09-081-2/+2
| | | |
* | | | Merge branch 'file-content-mobile' into 'master'Phil Hughes2017-09-111-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reduce top and bottom margin on file viewer on mobile See merge request !14114
| * | | | Reduce top and bottom margin on file viewer on mobilefile-content-mobileAnnabel Dunstone Gray2017-09-081-2/+5
| |/ / /
* | | | Merge branch 'conv-dev-index-regression' into 'master'Phil Hughes2017-09-114-7/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly associate ConvDev Index nav link with its controller Closes #37583 See merge request !14124
| * | | | Correctly link ConvDev Index nav links to its controller.conv-dev-index-regressionBryce Johnson2017-09-084-7/+12
| |/ / /
* | | | Merge branch '37454-remove-confidential-cb-edit-issue' into 'master'Phil Hughes2017-09-117-62/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove confidential toggle checkbox while editing issue inline Closes #37454 See merge request !14142
| * | | | Remove confidential toggle checkbox and related code as no longer necessary37454-remove-confidential-cb-edit-issuekushalpandya2017-09-117-62/+0
| | | | |
* | | | | Merge branch 'sidebar-expanded-large-screen' into 'master'Phil Hughes2017-09-115-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Check for sidebar cookie instead of class when resizing window Closes #37642 See merge request !14151
| * | | | Check for sidebar cookie instead of class when resizing windowAnnabel Dunstone Gray2017-09-115-5/+5
|/ / / /
* | | | Merge branch 'sh-bump-grape-logging-for-status-codes' into 'master'Robert Speicher2017-09-102-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump grape_logging gem to 1.7.0 to get status codes for error messages See merge request !14175
| * | | | Bump grape_logging gem to 1.7.0 to get status codes for error messagessh-bump-grape-logging-for-status-codesStan Hu2017-09-102-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | This recent update fixes an issue in grape_logging where the status code would be "fail" for any non-20x responses. For more details, see: https://github.com/aserafin/grape_logging/issues/29
* | | | Merge branch 'remove-bootlint' into 'master'Clement Ho2017-09-082-6/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove bootlint which takes 1 second of render time on development Closes #37657 See merge request !14167
| * | | | Remove bootlint which takes 1 second of render time on developmentJacob Schatz2017-09-082-6/+0
|/ / / /
* | | | Merge branch 'sidebar-drop-shadow' into 'master'Annabel Dunstone Gray2017-09-082-0/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Adds drop shadow to the expanded sidebar Closes #36750 and #13983 See merge request !13994
| * | | Adds drop shadow to the expanded sidebarPhil Hughes2017-09-082-0/+12
|/ / / | | | | | | | | | | | | | | | | | | Shadow is added in sm & md breakpoints. Clicking the anything outside of the sidebar also hides collapses the sidebar at these breakpoints. Closes #13983
* | | Merge branch 'revert-f2421b2b' into 'master'Robert Speicher2017-09-0833-648/+111
|\ \ \ | | | | | | | | | | | | | | | | Revert "Add option to change navigation color palette" See merge request !14148
| * | | Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-0833-648/+111
| | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* | | | Merge branch 'fix/ldap-typo-docs' into 'master'Achilleas Pipinellis2017-09-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [CE] Fix small typos in LDAP documentation See merge request !14153
| * | | | Update ldap.mdfix/ldap-typo-docsJames Lopez2017-09-081-1/+1
| | | | |
* | | | | Merge branch 'docs-quick-fix' into 'master'Achilleas Pipinellis2017-09-083-6/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: quick fix - indexes project settings See merge request !14158
| * | | | | index project settings doc from other indexesMarcia Ramos2017-09-082-0/+5
| | | | | |
| * | | | | copyeditMarcia Ramos2017-09-081-5/+5
| | | | | |
| * | | | | fixes linkMarcia Ramos2017-09-081-1/+1
|/ / / / /
* | | | | Merge branch 'fix/gb/qa/new-navigation-support' into 'master'Rémy Coutable2017-09-081-10/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Fix GitLab QA for new navigation enabled by default See merge request !14134
| * | | | Fix GitLab QA for new navigation enabled by defaultfix/gb/qa/new-navigation-supportGrzegorz Bizon2017-09-081-10/+11
| | | | |
* | | | | Merge branch 'jk-update-dependencies' into 'master'Achilleas Pipinellis2017-09-081-293/+326
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update dependencies license list for 10.0 See merge request !14137
| * | | | | Update dependencies license list for 10.0jk-update-dependenciesJarka Kadlecova2017-09-081-293/+326
| |/ / / /
* | | | | Merge branch 'jk-update-templates' into 'master'Achilleas Pipinellis2017-09-084-4/+55
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Update license templates for 10.0 See merge request !14136
| * | | | Update license templates for 10.0jk-update-templatesJarka Kadlecova2017-09-084-4/+55
| |/ / /
* | | | Merge branch 'docs-new-topic-projects-settings' into 'master'Achilleas Pipinellis2017-09-088-5/+80
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs new index for project's settings Closes #35719 See merge request !13552
| * | | | Docs new index for project's settingsMarcia Ramos2017-09-088-5/+80
|/ / / /
* | | | Merge branch 'fix-tooltip-width-issue-board' into 'master'Phil Hughes2017-09-082-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix tooltip width on collapsed issue board column titles See merge request !14129
| * | | | Fix tooltip width on collapsed issue board column titlesJedidiah2017-09-082-1/+6
|/ / / /
* | | | Merge branch 'docs/yaml-hidden-keys' into 'master'Marcia Ramos2017-09-081-11/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify yaml hidden keys (jobs) Closes #37480 See merge request !14110
| * | | | Clarify yaml hidden keys (jobs)docs/yaml-hidden-keysAchilleas Pipinellis2017-09-081-11/+17
| | | | |
* | | | | Merge branch 'uipolish-fix-2factor-warning' into 'master'Sean McGivern2017-09-082-6/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Tweak column widths on two factor warning messages See merge request !14112
| * | | | | Tweak column widths on two factor warning messagesJedidiah2017-09-082-6/+11
|/ / / / /
* | | | | Merge branch 'vue-eslint' into 'master'Phil Hughes2017-09-081-7/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a better explanation for alignment section Closes #32071 See merge request !14109
| * | | | | Adds a better explanation for alignment sectionFilipa Lacerda2017-09-081-7/+18
|/ / / / /
* | | | | Merge branch '37618-wrong-link-for-write-test-in-contributing-md' into 'master'Rémy Coutable2017-09-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wrong link for write test in CONTRIBUTING.md" Closes #37618 See merge request !14138
| * | | | | Fix wrong link in CONTRIBUTING.mdAchilleas Pipinellis2017-09-081-1/+1
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'gpg' into 'master'Rémy Coutable2017-09-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | update gpg_signed_commit to use 0xLONG format for gpg list keys See merge request !13839
| * | | | | | update gpg_signed_commit to use 0xLONG format for gpg list keysKevin Pankonen2017-09-071-2/+2
| | | | | | |
* | | | | | | Merge branch 'bugfix/graph-friendly-notes-number' into 'master'Rémy Coutable2017-09-082-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print notes number explained in the graph. Closes #37224 See merge request !13949