summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | 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 archiving Closes #35919 See merge request gitlab-org/gitlab-ce!14650
| | * | | | | | | 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
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove edit action for issues Closes #36670 See merge request gitlab-org/gitlab-ce!14523
| | * | | | | | | | 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.0 See merge request gitlab-org/gitlab-ce!14638
| | * | | | | | | | | 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_stamp See merge request gitlab-org/gitlab-ce!14615
| | * | | | | | | | | | Git ignore po files ending in time_stampgitignore-po-timestampAchilleas Pipinellis2017-10-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | Merge branch 'mr-widget-merged-date-tooltip' into 'master'Filipa Lacerda2017-10-036-22/+70
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes merge request widget date tooltip inconsistencies Closes #38545 See merge request gitlab-org/gitlab-ce!14578
| | * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the merge request widget would use the `updated_at` date as the tooltip text for both closed & merged states. This is incorrect as the `updated_at` date is actually changed when a user updates merge request through commenting, description changes or anything else. The widget states for merged & closed events now use their own event object which holds their own `updated_at` date string. Also this text has been correctly formatted through our date utilities to correctly display the right timezone data in a user friendly way. Closes #38545
| * | | | | | | | | | | | 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 diff See merge request gitlab-org/gitlab-ce!14561
| | * | | | | | | | | | | | 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.0 Closes #38685 See merge request gitlab-org/gitlab-ce!14635
| | * | | | | | | | | | | | | 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.0 See merge request gitlab-org/gitlab-ce!14630
| | * | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot rename a hashed project" Closes #38202 See merge request gitlab-org/gitlab-ce!14428
| | * | | | | | | | | | | | | | | 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 NotesController See merge request gitlab-org/gitlab-ce!14645
| | * | | | | | | | | | | | | | | | Improve performance of filtering notes in NotesControllersh-improve-perf-notes-actionsStan Hu2017-10-022-1/+35
| | | |_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduces the number of queries needed to redact notes to which the user does not have access. Also includes an N+1 query test as a guard against future issues. This is a follow-up from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14327#note_40976854.
| * | | | | | | | | | | | | | | | Merge branch 'close-issue-by-implements' into 'master'Sean McGivern2017-10-034-2/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "implements" to the default issue closing message regex Closes #38424 See merge request gitlab-org/gitlab-ce!14612
| | * | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Fast-Forward Merge to CE See merge request gitlab-org/gitlab-ce!14272
| | * | | | | | | | | | | | | | | | Update MR doc to indicate that the linear-history feature is available for ↵ff_port_from_eeValery Sizov2017-10-021-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE as well
| | * | | | | | | | | | | | | | | | 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` ↵Valery Sizov2017-09-293-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method
| | * | | | | | | | | | | | | | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-28181-897/+3488
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb db/schema.rb
| | * | | | | | | | | | | | | | | | | | Add period to multi-sentence rebase locally messageEric Eastwood2017-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/38251
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-26756-5209/+9284
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Add test to check for project settings merge strategiesEric Eastwood2017-09-261-0/+18
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Use js- classes instead of Vue refs in tests for some perfEric Eastwood2017-09-265-27/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272#note_41419104
| | * | | | | | | | | | | | | | | | | | Use new shared Vue mountComponent methodEric Eastwood2017-09-201-15/+5
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix entities/merge_request.json by adding ff_only_mergeValery Sizov2017-09-201-1/+2
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Add spec for Project#merge_methodValery Sizov2017-09-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be deleted from EE side when doing CE->EE merge!
| | * | | | | | | | | | | | | | | | | | Pulling merge_method spec for project_controller_spec from EE[ci skip]Valery Sizov2017-09-201-0/+18
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix ff_merge_requests.feature spinach testsEric Eastwood2017-09-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This error was thrown before ``` source repository is empty /builds/gitlab-org/gitlab-ce/lib/gitlab/git/repository.rb:838:in `block in fetch_source_branch' ```
| | * | | | | | | | | | | | | | | | | | Port fast-foward spinach specs from EEEric Eastwood2017-09-192-0/+89
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Port fast-forward widget_spec test from EEEric Eastwood2017-09-191-0/+22
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Update fast-forward doc links to point at own docsEric Eastwood2017-09-192-1/+2
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix MR docs link to fast-forward sectionEric Eastwood2017-09-191-3/+1
| | | | | | | | | | | | | | | | | | | |