Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add section on how we run CE->EE merge at GitLabashmckenzie/docs-ce-ee-merge-at-gitlab | Ash McKenzie | 2019-08-13 | 1 | -0/+13 |
* | Merge branch 'docs-debug-dstanley' into 'master' | Evan Read | 2019-08-13 | 1 | -0/+5 |
|\ | |||||
| * | Bring resources.md from debug project to docs | Marcel Amirault | 2019-08-13 | 1 | -0/+5 |
|/ | |||||
* | Merge branch 'philbz-master-patch-49694' into 'master' | Drew Blessing | 2019-08-13 | 1 | -0/+30 |
|\ | |||||
| * | Update Grafana doc for security update | Phil Zona | 2019-08-13 | 1 | -0/+30 |
|/ | |||||
* | Merge branch 'docs-styleguide-lists' into 'master' | Evan Read | 2019-08-13 | 1 | -11/+105 |
|\ | |||||
| * | Update list information in docs styleguide | Marcel Amirault | 2019-08-13 | 1 | -11/+105 |
|/ | |||||
* | Merge branch 'patch-73' into 'master' | Ray Paik | 2019-08-13 | 1 | -1/+1 |
|\ | |||||
| * | Update styleguide.md - just a little typo. | David Kartuzinski | 2019-08-12 | 1 | -1/+1 |
* | | Merge branch 'improve-quick-action-messages' into 'master' | Mayra Cabrera | 2019-08-13 | 9 | -85/+91 |
|\ \ | |||||
| * | | Improve quick action error messages | Heinrich Lee Yu | 2019-08-13 | 9 | -85/+91 |
|/ / | |||||
* | | Merge branch '63942-remove-config-action_dispatch-use_authenticated_cookie_en... | Thong Kuah | 2019-08-12 | 4 | -19/+29 |
|\ \ | |||||
| * | | Enable use of Rails' new cookie encryption | Heinrich Lee Yu | 2019-08-13 | 4 | -19/+29 |
* | | | Merge branch 'ce-12547-load-search-counts-async' into 'master' | Michael Kozono | 2019-08-12 | 21 | -180/+425 |
|\ \ \ | |||||
| * | | | Fix deprecation warning for dangerous order usage | Markus Koller | 2019-08-12 | 1 | -4/+6 |
| * | | | FE fetch counts async on search page load | Paul Slaughter | 2019-08-12 | 5 | -4/+71 |
| * | | | Load search result counts asynchronously | Markus Koller | 2019-08-12 | 16 | -176/+352 |
* | | | | Merge branch 'sh-fix-import-export-suggestions' into 'master' | Michael Kozono | 2019-08-12 | 4 | -2/+28 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Properly save suggestions in project exportssh-fix-import-export-suggestions | Stan Hu | 2019-08-10 | 4 | -2/+28 |
* | | | | Merge remote-tracking branch 'dev/master' | John T Skarbek | 2019-08-12 | 2 | -1/+21 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Update CHANGELOG.md for 12.0.6 | GitLab Release Tools Bot | 2019-08-12 | 1 | -0/+4 |
| * | | | Update CHANGELOG.md for 11.11.8 | GitLab Release Tools Bot | 2019-08-09 | 1 | -0/+8 |
| * | | | Update CHANGELOG.md for 12.1.5 | GitLab Release Tools Bot | 2019-08-09 | 3 | -10/+8 |
| * | | | Merge remote-tracking branch 'dev/pokstad1-master-patch-14984' | John T Skarbek | 2019-08-09 | 1 | -0/+5 |
| |\ \ \ | |||||
| | * | | | Update Gitaly to v1.53.2 for security fix | Paul Okstad | 2019-08-01 | 2 | -1/+6 |
| * | | | | Merge branch 'security-pages-api-token-recovery' into 'master' | John Skarbek | 2019-08-09 | 2 | -1/+6 |
| |\ \ \ \ | |||||
| | * | | | | Fix gitlab api token recovery | Vladimir Shushlin | 2019-08-09 | 2 | -1/+6 |
| |/ / / / | |||||
* | | | | | Merge branch 'add-metadata-to-epic-list-view-ce' into 'master' | Clement Ho | 2019-08-12 | 3 | -5/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Internationalize Issue and MR list metadata strings | Brett Walker | 2019-08-12 | 3 | -5/+16 |
|/ / / / / | |||||
* | | | | | Merge branch '65790-highlight' into 'master' | Annabel Dunstone Gray | 2019-08-12 | 5 | -2/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Adds highlight to collapsible line | Filipa Lacerda | 2019-08-12 | 5 | -2/+28 |
* | | | | | | Merge branch '65530-add-externalization-and-fix-regression-in-shortcuts-helpe... | Paul Slaughter | 2019-08-12 | 4 | -77/+247 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Resolve "Add externalization and fix regression in shortcuts helper modal" | Thomas Randolph | 2019-08-12 | 4 | -77/+247 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'update-graphicsmagick-to-1.3.33' into 'master' | Stan Hu | 2019-08-12 | 5 | -5/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update GraphicsMagick from 1.3.29 to 1.3.33 for CI tests | Takuya Noguchi | 2019-08-12 | 5 | -5/+10 |
* | | | | | | | Merge branch '65278-fix-puma-master-counter-wipe' into 'master' | Stan Hu | 2019-08-12 | 5 | -25/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove worker label from puma terminations metric65278-fix-puma-master-counter-wipe | Aleksei Lipniagov | 2019-08-12 | 2 | -6/+2 |
| * | | | | | | | Clean prometheus dir only for master process | Aleksei Lipniagov | 2019-08-12 | 1 | -1/+5 |
| * | | | | | | | Remove extra blank line | Aleksei Lipniagov | 2019-08-12 | 1 | -1/+0 |
| * | | | | | | | Fix metric files being wiped after the app starts | Aleksei Lipniagov | 2019-08-12 | 3 | -19/+20 |
* | | | | | | | | Merge branch 'renovate/gitlab-ui-5.x' into 'master' | Clement Ho | 2019-08-12 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update dependency @gitlab/ui to v5.15.0 | Lukas Eipert | 2019-08-08 | 2 | -5/+5 |
* | | | | | | | | | Merge branch 'jv-gitaly-1.58.0' into 'master' | Stan Hu | 2019-08-12 | 5 | -44/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update Gitaly server and gem to 1.58.0 | Jacob Vosmaer | 2019-08-12 | 5 | -44/+5 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'georgekoltsov/63408-user-mapping' into 'master' | Grzegorz Bizon | 2019-08-12 | 10 | -21/+55 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add code review suggestions | George Koltsov | 2019-08-12 | 1 | -4/+4 |
| * | | | | | | | | | Apply code review feedback | George Koltsov | 2019-08-08 | 4 | -16/+13 |
| * | | | | | | | | | Update project/import/bitbucket.md doc | George Koltsov | 2019-08-07 | 1 | -5/+5 |
| * | | | | | | | | | Add bitbucket_import/importer_spec.rb spec | George Koltsov | 2019-08-07 | 4 | -11/+34 |
| * | | | | | | | | | Add changelog entry | George Koltsov | 2019-08-07 | 1 | -0/+6 |