summaryrefslogtreecommitdiff
path: root/doc/workflow
Commit message (Collapse)AuthorAgeFilesLines
* Update html link to markdown linkpatch-8Lee Matos2016-12-151-1/+1
|
* applying style guide fixesLee Matos2016-12-151-1/+2
|
* Clarify instructions for importing Wiki/Merge Request dataLee Matos2016-12-131-0/+2
|
* Move MWPS document to new locationAchilleas Pipinellis2016-11-292-3/+3
|
* Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-2581-8/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (312 commits) Fix bad selection on dropdown menu for tags filter Fixed issue boards scrolling with a lot of lists & issues You can only assign default_branch when editing a project ... Don't convert data which already is the target type Stop supporting Google and Azure as backup strategies renames some of the specs and adds changelog entry Fixed dragging issue moving wrong issue after multiple drags of issue Fixed issue boards issue sorting when dragging issue into list Rephrase some system notes to be compatible with new system note style Add missing JIRA file that redirects to the new location Fix documentation to create the `pg_trm` extension before creating the DB Document that we always use `do...end` for `before` in RSpec Backport Note#commands_changes from EE Log mv_namespace parameters Add default_branch attr to Project API payload in docs. Fix title case to sentence case properly escape username validation error message flash Remove header ids from University docs Add missing documentation. Added test that checks the correct select box is there for the LFS ... ... Conflicts: app/services/system_note_service.rb spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb spec/services/system_note_service_spec.rb
| * Fix title case to sentence caseLuis Alonso Chavez Armendariz2016-11-233-2/+2
| |
| * Merge branch 'patch-13' into 'master' Achilleas Pipinellis2016-11-231-3/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | add details that Git LFS must be enabled in project ## What does this MR do? Add details that Git LFS must be enabled in project before it will work See merge request !7680
| | * add details that Git LFS must be enabled in projectBen Bodenmiller2016-11-221-3/+7
| | |
| * | Reduce size of images from 25MB to 13MB using pngquantAchilleas Pipinellis2016-11-2279-0/+0
| |/ | | | | | | | | | | Took it from https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3232 [ci skip]
| * Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-11-221-1/+1
| |\ | | | | | | | | | | | | fixed manage_large_binaries_with_git_lfs.md typo See merge request !7612
| | * fixed manage_large_binaries_with_git_lfs.md typoJán Dzurek2016-11-211-1/+1
| | |
| * | Add documentation about todos and failed buildsGrzegorz Bizon2016-11-211-2/+4
| |/
* | Update some docs to reflect MWPS name changeGrzegorz Bizon2016-11-211-1/+1
|/
* fix typo in gitlab_flow.md ('munch'->'much')kkkkkkkk2016-11-191-1/+1
|
* Try to cover more cases about receivers of pipeline notificationspipeline-notificationsLin Jen-Shin2016-11-091-2/+2
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_17981421
* Add pipelines to notifications documentationLin Jen-Shin2016-11-031-0/+3
|
* Convert CHANGELOG to MarkdownRobert Speicher2016-10-161-1/+1
| | | | | | | | | All this does is convert the version sections into headers. The list items shouldn't really be indented by two spaces, but it makes no difference to the rendering and this way we retain authorship history for the actual changes. Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
* Merge branch 'tmatesoft/gitlab-ce-migrate-from-svn-doc-update' into 'master' Achilleas Pipinellis2016-10-111-2/+106
|\ | | | | | | | | | | | | Add SubGit to the tools of SVN migration Originally from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6549. See merge request !6803
| * Refactor the SubGit/SVN documentationAchilleas Pipinellis2016-10-111-40/+52
| | | | | | | | [ci skip]
| * Update migrating_from_svn.md document on migration from SVN to GitLab as ↵TMate Software Support2016-10-101-23/+29
| | | | | | | | suggested by @axil in MR 6549.
| * Update migrating_from_svn.md TMate Software Support2016-09-271-3/+89
| | | | | | Documentation updated to cover Git/SVN mirror approach to migration from SVN to GitLab.
* | Change location and refactor issue closing pattern documentationAchilleas Pipinellis2016-09-221-0/+1
| | | | | | | | | | | | | | | | | | Split into user and administrator docs: - administration/issue_closing_pattern.md - user/project/issues/automatic_issue_closing.md [ci skip]
* | Add docs on Cycle AnalyticsAchilleas Pipinellis2016-09-201-0/+1
| | | | | | | | [ci skip]
* | Merge branch 'feature/github-edit-path' into 'master' Rémy Coutable2016-09-202-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Lets the user choose a namespace and name on Github imports Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14971 See merge request !5728
| * | updated example img in docsJames Lopez2016-09-201-0/+0
| | |
| * | modify github import JS and controller so we can now specify a namespace ↵James Lopez2016-09-202-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | and/or name for a project. - Fixed and added specs. - Added different namespace options depending on user privilages - Updated docs.
* | | Revert "Revert all changes introduced by ↵lfs-supportKamil Trzcinski2016-09-192-2/+10
| | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043" This reverts commit 6d43c95b7011ec7ec4600e00bdc8df76bb39813c.
* | | Revert all changes introduced by ↵Kamil Trzcinski2016-09-192-10/+2
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
* | | Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-194-35/+94
|\ \ \ | |/ /
| * | Clarify why GH integration is the preferred importing methodAchilleas Pipinellis2016-09-181-4/+5
| | |
| * | Refactor GitHub importing documentationAchilleas Pipinellis2016-09-184-44/+92
| | |
| * | Update GitHub importer documentation to reflect current importer stateDouglas Barbosa Alexandre2016-09-181-0/+10
| |/
* | Added CHANGELOG item and documentation.Patricio Cano2016-09-152-2/+10
|/
* Import GitHub release notesAndrew Smith2016-09-131-0/+1
| | | | | # Conflicts: # lib/gitlab/github_import/importer.rb
* Merge branch '21857-refactor-merge-requests-documentation' into 'master' Achilleas Pipinellis2016-09-0525-280/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor merge requests documentation ## What does this MR do? Add more information on merge requests. ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [x] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [x] Make sure internal links pointing to the document in question are not broken. - [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [x] If working on CE, submit an MR to EE with the changes as well. --- Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21857 See merge request !6202
| * Add links to new docs in merge_requests.md and workflow/README.mdAchilleas Pipinellis2016-09-051-5/+8
| |
| * Move revert_changes.md to new locationAchilleas Pipinellis2016-09-055-64/+1
| |
| * Move cherry_pick_changes.md to new locationAchilleas Pipinellis2016-09-055-52/+1
| |
| * Move `wip_merge_requests.md` to a new locationAchilleas Pipinellis2016-09-054-13/+1
| |
| * Move merge_when_build_succeeds.md to new locationAchilleas Pipinellis2016-09-053-15/+1
| |
| * Move authorization_for_merge_requests.md to new locationAchilleas Pipinellis2016-09-051-40/+1
| |
| * Move `workflow/merge_requests.md` to `user/project/merge_requests.md`Achilleas Pipinellis2016-09-057-91/+2
| |
* | Move web_editor doc to new locationAchilleas Pipinellis2016-09-0214-152/+2
|/
* Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfsPatricio Cano2016-08-301-5/+5
|
* Added CHANGELOG, documentation, and API functionalityPatricio Cano2016-08-301-0/+8
|
* Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-251-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitorious ## What does this MR do? Remove gitorious as import source ## Are there points in the code the reviewer needs to double check? Did I remove everything? ## Why was this MR needed? This button yielded a 404 ## What are the relevant issue numbers? Closes #17062 /cc @JobV See merge request !5866
| * Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-251-1/+1
| |
* | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-252-0/+8
|\ \ | |/ |/|
| * Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-221-8/+10
| |\ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-193-1/+38
| |\ \ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>