summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [skip ci] Merge branch 'master' into 'redesign-mr-widget-info-pipeline'redesign-mr-widget-info-pipelineClement Ho2018-06-26892-5851/+14495
|\
| * Merge branch 'acet-mr-diffs-autosave' into 'master'Tim Zallmann2018-06-263-2/+41
| |\
| | * Use refs instead of querySelector.Fatih Acet2018-06-261-2/+2
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into acet-mr-diffs-a...Fatih Acet2018-06-26223-1593/+2764
| | |\
| | * | Implement MR diff notes autosave feature.acet-mr-diffs-autosaveFatih Acet2018-06-223-2/+41
| * | | Merge branch 'revert-merge-request-widget-button-height' into 'master'Clement Ho2018-06-262-1/+5
| |\ \ \
| | * | | Revert merge request widget button max heightGeorge Tsiolis2018-06-262-1/+5
| * | | | Merge branch 'update-external-link-icon-in-header-user-dropdown' into 'master'Clement Ho2018-06-263-1/+10
| |\ \ \ \
| | * | | | Update external link icon in header user dropdownGeorge Tsiolis2018-06-263-1/+10
| | |/ / /
| * | | | Update CHANGELOG.md for 11.0.2GitLab Release Tools Bot2018-06-2611-50/+22
| |/ / /
| * | | Merge branch 'tz-mr-vue-imagediff' into 'master'Clement Ho2018-06-2615-39/+178
| |\ \ \
| | * | | Added Diff Viewer to new VUE based MR pageTim Zallmann2018-06-2615-39/+178
| |/ / /
| * | | Merge branch '48243-qa-deploy-key-cloning-test-sometimes-can-t-find-the-qa-el...Robert Speicher2018-06-261-0/+4
| |\ \ \
| | * | | [QA] Make sure we wait for the deploy key list to loadRémy Coutable2018-06-261-0/+4
| | | |/ | | |/|
| * | | Merge branch 'eslint-fix' into 'master'Filipa Lacerda2018-06-261-2/+2
| |\ \ \
| | * | | Fixed eslint failure in IDE spec helpersPhil Hughes2018-06-261-2/+2
| |/ / /
| * | | Merge branch '45703-open-web-ide-file-tree' into 'master'Phil Hughes2018-06-267-8/+117
| |\ \ \
| | * | | Show file in tree on WebIDE openPaul Slaughter2018-06-267-8/+117
| |/ / /
| * | | Merge branch '47794-environment-scope-cluster-page' into 'master'Mike Greiling2018-06-262-14/+27
| |\ \ \
| | * | | 47794 Change environment scope text depending on number of project clusters. ...47794-environment-scope-cluster-pagetauriedavis2018-06-252-14/+27
| * | | | Merge branch 'avatar-upload' into 'master'Mike Greiling2018-06-262-1/+7
| |\ \ \ \
| | * | | | Bugfix for #48378 - Resetting value of input element to fix Chrome-specific i...Chirag Bhatia2018-06-262-1/+7
| * | | | | Merge branch 'ce-update-branch-client-preparation' into 'master'Robert Speicher2018-06-261-2/+5
| |\ \ \ \ \
| | * | | | | Move git calls for `Repository#update_branch` inside Gitlab::Gitce-update-branch-client-preparationAlejandro Rodríguez2018-06-251-2/+5
| | |/ / / /
| * | | | | Merge branch 'prefer-destructuring-fix' into 'master'Mike Greiling2018-06-2689-161/+167
| |\ \ \ \ \
| | * | | | | Enable "prefer-destructuring" in JS filesgfyoung2018-06-2589-161/+167
| | | |/ / / | | |/| | |
| * | | | | Merge branch '46831-remove-unused-bootstrap-component-css' into 'master'Clement Ho2018-06-263-1/+44
| |\ \ \ \ \
| | * | | | | Resolve "Remove unused bootstrap component CSS"Sam Beckham2018-06-263-1/+44
| |/ / / / /
| * | | | | Merge branch 'dm-branch-api-can-push-fix' into 'master'Robert Speicher2018-06-262-3/+34
| |\ \ \ \ \
| | * | | | | Remove duplicate specDouwe Maan2018-06-261-6/+0
| | * | | | | Fix branch API can_push attribute and add specsdm-branch-api-can-push-fixDouwe Maan2018-06-252-3/+40
| * | | | | | Merge branch '47221-explain-what-groups-are-in-the-new-group-page' into 'master'Phil Hughes2018-06-262-18/+33
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Resolve "Explain what Groups are in the New Group page"Luke Bennett2018-06-262-18/+33
| |/ / / / /
| * | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-06-261-0/+1
| |\ \ \ \ \
| | * | | | | Update proofreader.mdAndré Gama2018-06-191-0/+1
| * | | | | | Merge branch 'ce-gitlab-elt' into 'master'Stan Hu2018-06-262-1/+9
| |\ \ \ \ \ \
| | * | | | | | port the EE changesMicaël Bergeron2018-06-261-1/+2
| | * | | | | | port stub_object_storage changesce-gitlab-eltMicaël Bergeron2018-06-221-1/+6
| | * | | | | | make the pseudonymizer application settings EE-CE friendlyMicaël Bergeron2018-06-221-0/+2
| * | | | | | | Merge branch 'add-rename-column-background-helper' into 'master'Yorick Peterse2018-06-266-56/+237
| |\ \ \ \ \ \ \
| | * | | | | | | Add a helper to rename a column using a background migrationSean McGivern2018-06-266-56/+237
| * | | | | | | | Merge branch 'add-missing-index-for-deployments' into 'master'Yorick Peterse2018-06-263-1/+25
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add index on deployable_type/id for deploymentsKamil Trzciński2018-06-263-1/+25
| * | | | | | | | | Merge branch 'gitaly-backup-opt-out' into 'master'Douwe Maan2018-06-261-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Move repo backup RPC's to opt-outgitaly-backup-opt-outJacob Vosmaer2018-06-251-4/+4
| * | | | | | | | | | Merge branch '48269-wiki-page-returns-error-code-502' into 'master'Douwe Maan2018-06-262-2/+9
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix performance bottleneck when rendering large wiki pagesSean McGivern2018-06-262-2/+9
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'improve-scope-description-layout' into 'master'Douwe Maan2018-06-262-6/+11
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update _scopes_form.html.haml to remove duplicate informationMarcel Amirault2018-06-262-6/+11
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'docs/install-by-branch' into 'master'Rémy Coutable2018-06-262-7/+5
| |\ \ \ \ \ \ \ \ \ \