kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/doc
History
Douwe Maan 0e2490c0cb Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' 
Resolve "SHA parameter in accept merge request API"

Add a `sha` parameter to the MR merge API, which must match the source SHA for the branch to be merged.

Also add the same parameter to the UI:

![MR_SHA](/uploads/616da728695dc19fa7ef7ef6a016ff81/MR_SHA.gif)

@DouweM and I discussed adding some smart feature to that, like updating the source SHA on navigating to the diff tab, but for now it will just require a refresh 😃

Closes #14139.

See merge request !4414
2016-06-03 12:41:58 +00:00
..
administration Explicitly mention advisory file locking 2016-06-01 14:46:07 -05:00
api Add sha parameter to MR accept API 2016-06-01 20:29:54 +01:00
ci Fix typo 2016-05-27 21:28:45 +00:00
container_registry Copyedit Registry user docs 2016-05-23 12:31:52 -05:00
customization Merge branch 'patch-1' into 'master' 2016-04-26 16:48:26 +00:00
development Fix typo 2016-06-02 23:04:08 +03:00
downgrade_ee_to_ce Split into sections, port downgrade_ee_to_ce doc from EE 2016-04-21 13:07:33 +03:00
gitlab-basics Change all occurrences of doc.gitlab.com to docs.gitlab.com 2016-05-13 16:26:56 -05:00
hooks Change all occurrences of doc.gitlab.com to docs.gitlab.com 2016-05-13 16:26:56 -05:00
incoming_email Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature 2016-03-25 13:05:15 +01:00
install Add Edge to supported browsers list. [ci skip] 2016-06-01 11:56:54 -06:00
integration Update Google integration API workflow 2016-05-23 18:35:04 +00:00
intro Change all occurrences of doc.gitlab.com to docs.gitlab.com 2016-05-13 16:26:56 -05:00
legal Reformats confusing '[named here]' section for 3rd party code attribution 2016-02-17 17:13:06 +00:00
logs Grammar fixes, simlink -> symlink 2016-05-29 22:34:40 -07:00
markdown Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename' 2016-05-20 16:23:04 -05:00
migrate_ci_to_ce errros -> errors 2016-05-29 22:34:58 -07:00
monitoring fixing typo in link #17809 2016-05-24 20:26:43 +02:00
operations succes -> success 2016-05-29 22:35:23 -07:00
permissions Update permission doc 2016-05-16 16:39:23 -05:00
profile Add references to the rouge gem library 2016-01-25 22:36:44 +01:00
project_services Tie example config to JIRA screenshot 2016-04-13 12:28:07 +03:00
public_access Fix documentation and improve permissions code 2016-04-18 11:12:28 -03:00
raketasks Change all occurrences of doc.gitlab.com to docs.gitlab.com 2016-05-13 16:26:56 -05:00
security Change landing page when skipping confirmation email and add documentation 2016-05-16 14:56:32 -03:00
ssh Fixed Window's commands for SSH Help. 2016-02-06 12:17:12 +00:00
system_hooks Using single builder for push and tag events 2016-04-19 11:00:30 +02:00
update Fix 18009: add missing steps in update docs 2016-05-30 17:46:54 +02:00
web_hooks Fix hook data for Wiki Page event 2016-05-31 11:24:58 -03:00
workflow Merge branch 'issue_9013' into 'master' 2016-05-20 21:04:55 +00:00
README.md Fix link to container Registry user docs 2016-05-23 11:47:19 -05:00

README.md

Documentation

User documentation

  • API Automate GitLab via a simple and powerful API.
  • CI GitLab Continuous Integration (CI) getting started, .gitlab-ci.yml options, and examples.
  • GitLab as OAuth2 authentication service provider. It allows you to login to other applications from GitLab.
  • GitLab Basics Find step by step how to start working on your commandline and on GitLab.
  • Importing to GitLab.
  • Markdown GitLab's advanced formatting system.
  • Migrating from SVN Convert a SVN repository to Git and GitLab
  • Permissions Learn what each role in a project (external/guest/reporter/developer/master/owner) can do.
  • Profile Settings
  • Project Services Integrate a project with external services, such as CI and chat.
  • Public access Learn how you can allow public and internal access to projects.
  • Container Registry Learn how to use GitLab Container Registry.
  • SSH Setup your ssh keys and deploy keys for secure access to your projects.
  • Webhooks Let GitLab notify you when new code has been pushed to your project.
  • Workflow Using GitLab functionality and importing projects from GitHub and SVN.

Administrator documentation

Contributor documentation

  • Documentation styleguide Use this styleguide if you are contributing to documentation.
  • Development Explains the architecture and the guidelines for shell commands.
  • Legal Contributor license agreements.