Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add locked state to merge request API | Chantal Rollison | 2018-06-28 | 8 | -25/+49 |
* | Merge branch 'gitaly-storage-validation' into 'master' | Rémy Coutable | 2018-06-27 | 4 | -72/+2 |
|\ | |||||
| * | Migrate storage nesting check to Gitaly | Jacob Vosmaer (GitLab) | 2018-06-27 | 4 | -72/+2 |
|/ | |||||
* | Merge branch 'hashed-storage-rollback-docs' into 'master' | Nick Thomas | 2018-06-27 | 1 | -2/+66 |
|\ | |||||
| * | Improve Hashed Storage documentation for rollback | Gabriel Mazetto | 2018-06-27 | 1 | -2/+66 |
* | | Merge branch 'fl-tech-debt' into 'master' | Phil Hughes | 2018-06-27 | 11 | -673/+686 |
|\ \ | |||||
| * | | Moves boards components into a .vue filefl-tech-debt | Filipa Lacerda | 2018-06-26 | 11 | -673/+686 |
* | | | Merge branch 'doc-exception-request-links' into 'master' | Marin Jankovski | 2018-06-27 | 1 | -18/+1 |
|\ \ \ | |||||
| * | | | Updates exception request documentation to link to the new location | Filipa Lacerda | 2018-06-27 | 1 | -18/+1 |
* | | | | Merge branch 'zj-gitaly-read-write-check' into 'master' | Nick Thomas | 2018-06-27 | 15 | -393/+81 |
|\ \ \ \ | |||||
| * | | | | Gitaly metrics check for read/writeability | Zeger-Jan van de Weg | 2018-06-27 | 15 | -393/+81 |
* | | | | | Merge branch '48528-fix-mr-autocompletion' into 'master' | Sean McGivern | 2018-06-27 | 3 | -2/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Add changelog entry | Kushal Pandya | 2018-06-27 | 1 | -0/+5 |
| * | | | | | Fix merge requests data source key to be camelCase | Kushal Pandya | 2018-06-27 | 2 | -2/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'frozen-string-enable-app-workers-2' into 'master' | Rémy Coutable | 2018-06-27 | 24 | -0/+51 |
|\ \ \ \ \ | |||||
| * | | | | | Enable frozen string for app/workers/**/*.rb | gfyoung | 2018-06-27 | 24 | -0/+51 |
* | | | | | | Merge branch '46546-do-not-pre-select-previous-user-s-when-creating-protected... | Phil Hughes | 2018-06-27 | 4 | -61/+61 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | CE port gitlab-ee!6112 | Luke Bennett | 2018-06-27 | 4 | -61/+61 |
|/ / / / / | |||||
* | | | | | Merge branch 'rs-spec-models-parity' into 'master' | Rémy Coutable | 2018-06-27 | 1 | -7/+29 |
|\ \ \ \ \ | |||||
| * | | | | | CE-EE parity for spec/models/repository_spec.rbrs-spec-models-parity | Robert Speicher | 2018-06-25 | 1 | -7/+29 |
* | | | | | | Merge branch 'gitaly-tree-entry-dot-dot' into 'master' | Sean McGivern | 2018-06-27 | 3 | -49/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Client-side fix for Gitaly TreeEntry buggitaly-tree-entry-dot-dot | Jacob Vosmaer | 2018-06-26 | 3 | -49/+30 |
* | | | | | | | Merge branch '40484-copy-ordered-lists-gfm' into 'master' | Phil Hughes | 2018-06-27 | 3 | -1/+74 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Resolve "Copying ordered list to new comment becomes unordered" | Jan Beckmann | 2018-06-27 | 3 | -1/+74 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'frozen-string-app-workers' into 'master' | Rémy Coutable | 2018-06-27 | 87 | -9/+183 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Enable frozen string literals for app/workers/*.rb | gfyoung | 2018-06-27 | 87 | -9/+183 |
|/ / / / / / | |||||
* | | | | | | Merge branch '48461-search-dropdown-hides-shows-when-typing' into 'master' | Mike Greiling | 2018-06-27 | 2 | -3/+8 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Resolve "Search dropdown hides & shows when typing" | Clement Ho | 2018-06-27 | 2 | -3/+8 |
|/ / / / / | |||||
* | | | | | Merge branch 'acet-mr-diffs-autosave' into 'master' | Tim Zallmann | 2018-06-26 | 3 | -2/+41 |
|\ \ \ \ \ | |||||
| * | | | | | Use refs instead of querySelector. | Fatih Acet | 2018-06-26 | 1 | -2/+2 |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into acet-mr-diffs-a... | Fatih Acet | 2018-06-26 | 223 | -1593/+2764 |
| |\ \ \ \ \ | |||||
| * | | | | | | Implement MR diff notes autosave feature.acet-mr-diffs-autosave | Fatih Acet | 2018-06-22 | 3 | -2/+41 |
* | | | | | | | Merge branch 'revert-merge-request-widget-button-height' into 'master' | Clement Ho | 2018-06-26 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert merge request widget button max height | George Tsiolis | 2018-06-26 | 2 | -1/+5 |
* | | | | | | | | Merge branch 'update-external-link-icon-in-header-user-dropdown' into 'master' | Clement Ho | 2018-06-26 | 3 | -1/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update external link icon in header user dropdown | George Tsiolis | 2018-06-26 | 3 | -1/+10 |
| |/ / / / / / / | |||||
* | | | | | | | | Update CHANGELOG.md for 11.0.2 | GitLab Release Tools Bot | 2018-06-26 | 11 | -50/+22 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'tz-mr-vue-imagediff' into 'master' | Clement Ho | 2018-06-26 | 15 | -39/+178 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Added Diff Viewer to new VUE based MR page | Tim Zallmann | 2018-06-26 | 15 | -39/+178 |
|/ / / / / / | |||||
* | | | | | | Merge branch '48243-qa-deploy-key-cloning-test-sometimes-can-t-find-the-qa-el... | Robert Speicher | 2018-06-26 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [QA] Make sure we wait for the deploy key list to load | Rémy Coutable | 2018-06-26 | 1 | -0/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'eslint-fix' into 'master' | Filipa Lacerda | 2018-06-26 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed eslint failure in IDE spec helpers | Phil Hughes | 2018-06-26 | 1 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | Merge branch '45703-open-web-ide-file-tree' into 'master' | Phil Hughes | 2018-06-26 | 7 | -8/+117 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Show file in tree on WebIDE open | Paul Slaughter | 2018-06-26 | 7 | -8/+117 |
|/ / / / / / | |||||
* | | | | | | Merge branch '47794-environment-scope-cluster-page' into 'master' | Mike Greiling | 2018-06-26 | 2 | -14/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 47794 Change environment scope text depending on number of project clusters. ...47794-environment-scope-cluster-page | tauriedavis | 2018-06-25 | 2 | -14/+27 |
* | | | | | | | Merge branch 'avatar-upload' into 'master' | Mike Greiling | 2018-06-26 | 2 | -1/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bugfix for #48378 - Resetting value of input element to fix Chrome-specific i... | Chirag Bhatia | 2018-06-26 | 2 | -1/+7 |
* | | | | | | | | Merge branch 'ce-update-branch-client-preparation' into 'master' | Robert Speicher | 2018-06-26 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ |