summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [Rails5] Apply patchblackst0ne-rails5-master-with-patchesblackst0ne2018-06-292-1/+6
* [Rails5] Apply patchesblackst0ne2018-06-2810-17/+40
* Merge branch 'rs-authorize-is-hard-to-spell' into 'master'Stan Hu2018-06-274-5/+5
|\
| * Correct "autorize" typosRobert Speicher2018-06-274-5/+5
* | Merge branch 'sh-fix-spelling-gitlab-yml' into 'master'Robert Speicher2018-06-271-1/+1
|\ \
| * | Fix spelling: Uncommment -> UncommentStan Hu2018-06-271-1/+1
* | | Merge branch '_diff-lines-refactor' into 'master'Tim Zallmann2018-06-2713-646/+598
|\ \ \ | |/ / |/| |
| * | Componentize diff lines and diff commentsFatih Acet2018-06-2713-646/+598
|/ /
* | Merge branch 'tc-repo-check-per-shard' into 'master'Robert Speicher2018-06-2710-11/+220
|\ \ | |/ |/|
| * Refactor fetching healthy shards with Gitlab::HealthChecks::GitalyCheckToon Claes2018-06-271-10/+3
| * Rename method to #each_eligible_shardToon Claes2018-06-272-2/+2
| * Add RepositoryCheck::DispatchWorker to start worker per shardToon Claes2018-06-277-11/+96
| * Bring Gitlab::ShardHealthCache to CEToon Claes2018-06-273-0/+95
| * Extract EachShardWorker into a concernToon Claes2018-06-271-0/+36
|/
* Merge branch 'gitaly-storage-validation' into 'master'Rémy Coutable2018-06-274-72/+2
|\
| * Migrate storage nesting check to GitalyJacob Vosmaer (GitLab)2018-06-274-72/+2
|/
* Merge branch 'hashed-storage-rollback-docs' into 'master'Nick Thomas2018-06-271-2/+66
|\
| * Improve Hashed Storage documentation for rollbackGabriel Mazetto2018-06-271-2/+66
* | Merge branch 'fl-tech-debt' into 'master'Phil Hughes2018-06-2711-673/+686
|\ \
| * | Moves boards components into a .vue filefl-tech-debtFilipa Lacerda2018-06-2611-673/+686
* | | Merge branch 'doc-exception-request-links' into 'master'Marin Jankovski2018-06-271-18/+1
|\ \ \
| * | | Updates exception request documentation to link to the new locationFilipa Lacerda2018-06-271-18/+1
* | | | Merge branch 'zj-gitaly-read-write-check' into 'master'Nick Thomas2018-06-2715-393/+81
|\ \ \ \
| * | | | Gitaly metrics check for read/writeabilityZeger-Jan van de Weg2018-06-2715-393/+81
* | | | | Merge branch '48528-fix-mr-autocompletion' into 'master'Sean McGivern2018-06-273-2/+7
|\ \ \ \ \
| * | | | | Add changelog entryKushal Pandya2018-06-271-0/+5
| * | | | | Fix merge requests data source key to be camelCaseKushal Pandya2018-06-272-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'frozen-string-enable-app-workers-2' into 'master'Rémy Coutable2018-06-2724-0/+51
|\ \ \ \ \
| * | | | | Enable frozen string for app/workers/**/*.rbgfyoung2018-06-2724-0/+51
* | | | | | Merge branch '46546-do-not-pre-select-previous-user-s-when-creating-protected...Phil Hughes2018-06-274-61/+61
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | CE port gitlab-ee!6112Luke Bennett2018-06-274-61/+61
|/ / / / /
* | | | | Merge branch 'rs-spec-models-parity' into 'master'Rémy Coutable2018-06-271-7/+29
|\ \ \ \ \
| * | | | | CE-EE parity for spec/models/repository_spec.rbrs-spec-models-parityRobert Speicher2018-06-251-7/+29
* | | | | | Merge branch 'gitaly-tree-entry-dot-dot' into 'master'Sean McGivern2018-06-273-49/+30
|\ \ \ \ \ \
| * | | | | | Client-side fix for Gitaly TreeEntry buggitaly-tree-entry-dot-dotJacob Vosmaer2018-06-263-49/+30
* | | | | | | Merge branch '40484-copy-ordered-lists-gfm' into 'master'Phil Hughes2018-06-273-1/+74
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Resolve "Copying ordered list to new comment becomes unordered"Jan Beckmann2018-06-273-1/+74
|/ / / / / /
* | | | | | Merge branch 'frozen-string-app-workers' into 'master'Rémy Coutable2018-06-2787-9/+183
|\ \ \ \ \ \
| * | | | | | Enable frozen string literals for app/workers/*.rbgfyoung2018-06-2787-9/+183
|/ / / / / /
* | | | | | Merge branch '48461-search-dropdown-hides-shows-when-typing' into 'master'Mike Greiling2018-06-272-3/+8
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Resolve "Search dropdown hides & shows when typing"Clement Ho2018-06-272-3/+8
|/ / / / /
* | | | | 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
|/ / / / / / /