summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Reset all connection schema cache after migration tests37608-reset-all-connectionsLin Jen-Shin2017-09-121-1/+3
| | | | | | We might also want to consider reduce the number of connections in the tests. However I just tried setting it to 1 and that doesn't seem enough for feature tests.
* Merge branch 'replace_spinach_wiki.feature' into 'master'Rémy Coutable2017-09-118-470/+413
|\ | | | | | | | | Replace 'project/wiki.feature' spinach test with an rspec analog See merge request !13856
| * Replace 'project/wiki.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-118-470/+413
| |
* | Merge branch 'docs/gitaly-patch-update' into 'master'Rémy Coutable2017-09-111-3/+11
|\ \ | | | | | | | | | | | | | | | | | | Add gitaly to patch update doc Closes gitlab-ee#3389 See merge request !14184
| * | Add gitaly to patch update docAchilleas Pipinellis2017-09-111-3/+11
| |/
* | Merge branch 'italicized_emoji' into 'master'Annabel Dunstone Gray2017-09-112-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Emoji was rendered as italic Closes #31676 See merge request !13974
| * | Emoji was rendered as italicBranka Martinovic2017-09-112-0/+6
|/ /
* | Merge branch 'replace_group_links.feature' into 'master'Rémy Coutable2017-09-114-67/+46
|\ \ | | | | | | | | | | | | Replace 'project/group_links.feature' spinach test with an rspec analog See merge request !14169
| * | Replace project/group_links.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-104-67/+46
| |/
* | Merge branch 'docs/document-swapping-tables' into 'master'Rémy Coutable2017-09-112-0/+54
|\ \ | | | | | | | | | | | | Document how to swap database tables. See merge request !14183
| * | Document how to swap database tables.docs/document-swapping-tablesYorick Peterse2017-09-112-0/+54
| | |
* | | Merge branch 'ie-event-polyfill' into 'master'Phil Hughes2017-09-114-1/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds Event polyfill for IE Closes #37633 See merge request !14159
| * | | Adds Event polyfill for IEFilipa Lacerda2017-09-114-1/+30
|/ / /
* | | Merge branch 'rc/backport-workhorse-send_artifacts_entry-signature-from-ee' ↵Kamil Trzciński2017-09-111-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Backport the EE signature of Gitlab::Workhorse#send_artifacts_entry See merge request !14144
| * | | Backport the EE signature of Gitlab::Workhorse#send_artifacts_entryrc/backport-workhorse-send_artifacts_entry-signature-from-eeRémy Coutable2017-09-081-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'sh-filter-runner-token' into 'master'Robert Speicher2017-09-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Expand filtered parameters to include `token` See merge request !14174
| * | | | Expand filtered parameters to include `token`sh-filter-runner-tokenStan Hu2017-09-101-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | Now that we are logging API requests in `api_json.log`, we see that the runner token was not filtered properly.
* | | | Merge branch '37647-follow-up-from-update-helm-chart-docs-from-ce-docs' into ↵Achilleas Pipinellis2017-09-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve Follow-up from Update Helm Chart docs from CE - docs Closes #37647 See merge request !14166
| * | | | Fix links37647-follow-up-from-update-helm-chart-docs-from-ce-docsJoshua Lambert2017-09-082-6/+6
| | | | |
| * | | | Fix linksJoshua Lambert2017-09-083-9/+9
| | | | |
| * | | | Make links relativeJoshua Lambert2017-09-084-14/+14
| | | | |
* | | | | Merge branch 'replace_emails.feature' into 'master'Rémy Coutable2017-09-114-74/+83
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'profile/emails.feature' spinach test with an rspec analog See merge request !14172
| * | | | | Replace the profile/emails.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-104-74/+83
| | |/ / / | |/| | |
* | | | | Merge branch 'replace_team_management.feature' into 'master'Rémy Coutable2017-09-114-113/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/team_management.feature' spinach test with an rspec analog See merge request !14173
| * | | | | Replace the project/team_management.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-104-113/+73
| |/ / / /
* | | | | Merge branch ↵Tim Zallmann2017-09-115-18/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37644-update-prometheus-metric-library-to-support-multiple-series-and-colors' into 'master' Update Prometheus Metric Library to support multiple series and colors Closes #37644 See merge request !14155
| * | | | | update ingress doc37644-update-prometheus-metric-library-to-support-multiple-series-and-colorsJoshua Lambert2017-09-091-1/+1
| | | | | |
| * | | | | Fix ingress queryJoshua Lambert2017-09-091-2/+3
| | | | | |
| * | | | | Update k8s metrics and docsJoshua Lambert2017-09-082-2/+2
| | | | | |
| * | | | | Update queries for colors and seriesJoshua Lambert2017-09-085-18/+59
| | | | | |
* | | | | | Merge branch 'import-sources-fix' into 'master'Rémy Coutable2017-09-113-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read import sources from setting at first initialization See merge request !14141
| * | | | | | Read import sources from setting at first initializationVisay Keo2017-09-093-2/+7
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'changes-tab-jumping' into 'master'Filipa Lacerda2017-09-112-1/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed changes bar jumping on merge requests Closes #37589 See merge request !14157
| * | | | | Fixed changes bar jumping on merge requestschanges-tab-jumpingPhil Hughes2017-09-082-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Closes #37589
* | | | | | 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
View Lorry Controller Status