summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* address-code-styling32163-protected-branch-form-should-have-sane-defaults-for-dropdownsJose Ivan Vargas2017-10-041-4/+4
* Merge branch 'master' into 32163-protected-branch-form-should-have-sane-defau...Jose Ivan Vargas2017-10-03489-6589/+12400
|\
| * Merge branch 'commit-row-avatar-align-top' into 'master'Annabel Dunstone Gray2017-10-032-0/+9
| |\
| | * Fixed commit avatar being aligned verticallycommit-row-avatar-align-topPhil Hughes2017-09-292-0/+9
| * | Merge branch '38502-fix-nav-dropdown-close-animation' into 'master'Annabel Dunstone Gray2017-10-032-0/+12
| |\ \
| | * | Fix navigation dropdown close animation on mobile screensKushal Pandya2017-10-032-0/+12
| |/ /
| * | Merge branch 'add-labels-template-index' into 'master'Yorick Peterse2017-10-033-0/+51
| |\ \
| | * | Add (partial) index on Labels.templateGreg Stark2017-10-033-0/+51
| * | | Merge branch 'fix-gemfile-lock' into 'master'Sean McGivern2017-10-031-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix gitaly-proto version in Gemfile.lockAhmad Sherif2017-10-031-1/+1
| * | | Merge branch 'grpc-logger' into 'master'Rémy Coutable2017-10-032-0/+19
| |\ \ \ | | |/ / | |/| |
| | * | Add grpc.log for GitalyJacob Vosmaer (GitLab)2017-10-032-0/+19
| |/ /
| * | Merge branch 'docs-add-summary-about-project-archiving' into 'master'Achilleas Pipinellis2017-10-032-0/+13
| |\ \
| | * | Add documentation to summarise project archivingMark Fletcher2017-10-032-0/+13
| * | | Merge branch '36670-remove-edit-form' into 'master'Sean McGivern2017-10-0311-421/+195
| |\ \ \
| | * | | refactor issues_controller_spec `update` actionJarka Kadlecova2017-10-031-157/+140
| | * | | Remove edit action for issuesJarka Kadlecova2017-10-0311-271/+62
| * | | | Merge branch 'feature/bump-gitaly-proto-version' into 'master'Robert Speicher2017-10-032-2/+2
| |\ \ \ \
| | * | | | Bump gitaly-proto version to v0.39.0feature/bump-gitaly-proto-versionAhmad Sherif2017-10-022-2/+2
| * | | | | Merge branch 'gitignore-po-timestamp' into 'master'Rémy Coutable2017-10-031-0/+1
| |\ \ \ \ \
| | * | | | | Git ignore po files ending in time_stampgitignore-po-timestampAchilleas Pipinellis2017-10-021-0/+1
| * | | | | | Merge branch 'mr-widget-merged-date-tooltip' into 'master'Filipa Lacerda2017-10-036-22/+70
| |\ \ \ \ \ \
| | * | | | | | fixed specs when merged event was emptymr-widget-merged-date-tooltipPhil Hughes2017-09-291-4/+10
| | * | | | | | Fixes merge request widget date tooltip inconsistenciesPhil Hughes2017-09-296-21/+63
| * | | | | | | Merge branch 'dm-copy-parallel-diff' into 'master'Phil Hughes2017-10-0310-100/+208
| |\ \ \ \ \ \ \
| | * | | | | | | Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diffDouwe Maan2017-10-0210-100/+208
| * | | | | | | | Merge branch 'fix-kubectl-180' into 'master'Kamil Trzciński2017-10-034-3/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix broken certificate-authority-data with kubectl >= 1.8.0fix-kubectl-180Alessio Caiazza2017-10-034-3/+8
| * | | | | | | | | Merge branch 'update-pages-0.6' into 'master'Kamil Trzciński2017-10-032-1/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update GitLab Pages to v0.6.0Nick Thomas2017-10-022-1/+6
| * | | | | | | | | | Merge branch '38202-cannot-rename-a-hashed-project' into 'master'Nick Thomas2017-10-034-32/+103
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix specs for project creation and update services38202-cannot-rename-a-hashed-projectDouglas Barbosa Alexandre2017-10-022-3/+3
| | * | | | | | | | | | Add CHANGELOGDouglas Barbosa Alexandre2017-10-021-0/+6
| | * | | | | | | | | | Doesn't check if path exists on disk when renaming a hashed projectDouglas Barbosa Alexandre2017-10-023-32/+97
| * | | | | | | | | | | Merge branch 'sh-improve-perf-notes-actions' into 'master'Douwe Maan2017-10-032-1/+35
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Improve performance of filtering notes in NotesControllersh-improve-perf-notes-actionsStan Hu2017-10-022-1/+35
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'close-issue-by-implements' into 'master'Sean McGivern2017-10-034-2/+47
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add "implements" to the default issue closing message regexGuilherme Vieira2017-10-024-2/+47
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'ff_port_from_ee' into 'master'Sean McGivern2017-10-0338-95/+679
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update MR doc to indicate that the linear-history feature is available for CE...ff_port_from_eeValery Sizov2017-10-021-2/+0
| | * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_eeValery Sizov2017-10-02215-4786/+7056
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add merge_requests_rebase_enabled to json entities for specsValery Sizov2017-10-022-1/+3
| | * | | | | | | | | | | | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-298-3/+36
| | * | | | | | | | | | | | [Backport Semi-linear history] Update Project#ff_merge_must_be_possible? methodValery Sizov2017-09-291-1/+1
| | * | | | | | | | | | | | Backport documentation for semi-linear historyValery Sizov2017-09-291-0/+12
| | * | | | | | | | | | | | update a changelogValery Sizov2017-09-291-1/+1
| | * | | | | | | | | | | | [Port semi-linear history from EE] Move migration to CE and `merge_method` me...Valery Sizov2017-09-293-1/+31
| | * | | | | | | | | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-28181-897/+3488
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add period to multi-sentence rebase locally messageEric Eastwood2017-09-281-1/+1
| | * | | | | | | | | | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-26756-5209/+9284
| | |\ \ \ \ \ \ \ \ \ \ \ \ \