home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,963 Commits 48 Branches 340 Tags
f680eca912f854373fc538ae1e9d0dcb60fcd310
Commit Graph
3622 Commits
Author SHA1 Message Date
Sean McGivern d863d86aeb Add sha parameter to MR accept API 
The `sha` parameter is optional, and when present, must match the
current HEAD SHA of the source branch. Otherwise, the API call fails
with a 409 Conflict and a message containing the current HEAD for the
source branch.

Also tidy up some doc wording.
 2016-06-01 20:29:54 +01:00
Connor Shea 22e7aab8fb Add Edge to supported browsers list. [ci skip] 2016-06-01 11:56:54 -06:00
Rémy Coutable adcbd00135 Merge branch 'doc_api_services_jira_amend' into 'master' 
Amend jira service api docs [ci skip]

## What does this MR do?

Amends the API documentation for jira service integration

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

The current documentation omits the username and password parameters

## What are the relevant issue numbers?

## Screenshots (if relevant)

See merge request !4382
 2016-06-01 09:09:37 +00:00
Rémy Coutable c12c77eb25 Merge branch 'feature/improve_wiki_page_events' into 'master' 
Include Wiki attributes in Wiki page events webhook

The hook data we are sending is not 100% correct (we send details of the project, but should also send details of the "ProjectWiki" attributes like URLs and repositories relative to the wiki itself).

This is a follow up to #17506

Fixes #17507

See merge request !4138
 2016-05-31 18:10:23 +00:00
Richard Grainger 024227bdbf Amend jira service api docs [ci skip] 2016-05-31 17:28:20 +01:00
Gabriel Mazetto aaaed331ba Fix hook data for Wiki Page event 
Added "wiki" section and removed "repository"
 2016-05-31 11:24:58 -03:00
Kamil Trzcinski 846d111f1d Add Application Setting to configure Container Registry token expire delay (default 5min) 2016-05-31 13:23:13 +02:00
Rémy Coutable ba81c91255 Merge branch 'patch/wiki_page_events' into 'master' 
Enable Wiki Page events from Webhook admin UI in a Project

* Added UI to enable page wiki events
* Documentation for this event in Webhooks page

Fixes #17506

--- 

![new_webhook_UI](/uploads/63ef24b4ccef13ac7a5fda83e9ce64ad/new_webhook_UI.png)

See merge request !4135
 2016-05-31 08:34:38 +00:00
Robert Speicher b5decabb00 Merge branch 'patch-1' into 'master' 
Fix typo

Add missing "of" to CI YAML docs.

[ci skip]

See merge request !4331
 2016-05-30 22:11:05 +00:00
Robert Speicher 38fa9e8f67 Merge branch 'docs-typo-fixes' into 'master' 
Fix various documentation typos and spelling mistakes

[ci skip]

See merge request !4345
 2016-05-30 21:36:13 +00:00
Gabriel Mazetto 6506a9dd44 Added documentation to current Wiki Page event webhook 2016-05-30 16:12:50 -03:00
Arian Sameni b0a2bf0849 Fix 18009: add missing steps in update docs 2016-05-30 17:46:54 +02:00
Chris Spicer 9948a8fb8d succes -> success 2016-05-29 22:35:23 -07:00
Chris Spicer 403eea7b7a errros -> errors 2016-05-29 22:34:58 -07:00
Chris Spicer eda55662f3 Grammar fixes, simlink -> symlink 2016-05-29 22:34:40 -07:00
Chris Spicer 03901e5429 occuring -> occurring 2016-05-29 22:32:09 -07:00
Chris Spicer 348d16f524 updtae -> update 2016-05-29 22:31:39 -07:00
Chris Spicer 556a41660e Add space after comma, add space between 'beautomatically' 2016-05-29 22:31:22 -07:00
Chris Spicer 1b0367a422 Add space between 'Criticalissue' 2016-05-29 22:30:47 -07:00
Chris Spicer 8e31da9445 commited -> committed 2016-05-29 22:30:16 -07:00
Aurelio Jargas d7e714e4fd Fix typo 2016-05-27 21:28:45 +00:00
Jacob Vosmaer 1adaeb7d67 Use gitlab-workhorse 0.7.4 
This enables
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4278 .
 2016-05-27 13:06:02 +02:00
Achilleas Pipinellis 09ad002058 Merge branch 'add_ha_diagrams' into 'master' 
Add new HA diagrams [ci skip]

## What does this MR do?

Adds new HA diagrams created by @lukebabb (Thanks @lukebabb!)

See merge request !4289
 2016-05-25 21:36:25 +00:00
Robert Speicher 7fa1ab469f Merge remote-tracking branch 'github/master' into 'master' 2016-05-25 16:13:57 -04:00
Jacob Schatz 42e55585bb Merge branch 'dz-improve-ui-guide' into 'master' 
Write some thoughts to the UI guide

cc @skyruler 

See merge request !4290
 2016-05-25 19:55:14 +00:00
Robert Speicher 2c89d6664a Merge pull request #10338 from donhui/patch-1 
Fix typo in HA documentation

[ci skip]
 2016-05-25 15:18:00 -04:00
Jacob Schatz 16817cc49f Fix the english. 2016-05-25 14:57:15 -04:00
Dmitriy Zaporozhets f7da994cfd Write some thoughts to the UI guide 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-25 20:44:02 +02:00
Dmitriy Zaporozhets c04f85a333 Merge branch 'rs-rubocop-nottonot' into 'master' 
Enable RSpec/NotToNot cop and auto-correct offenses

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761

See merge request !4267
 2016-05-25 16:46:29 +00:00
Drew Blessing b10b6f963d Add new HA diagrams [ci skip] 2016-05-25 11:35:00 -05:00
Robert Speicher 75739e54be Enable RSpec/NotToNot cop and auto-correct offenses 
Also removes the note from the development/testing.md guide
 2016-05-24 15:40:29 -04:00
Robert Speicher 28dbf9317b Merge branch 'patch-2' into 'master' 
Update branch name from 8-7-stable to 8-8-stable

Fix inconsistency with the command listed above.

[ci skip]

See merge request !4274
 2016-05-24 19:28:15 +00:00
sebastian-schmid 12cf4f885a fixing typo in link #17809 2016-05-24 20:26:43 +02:00
Florian Preinstorfer 07a3b09b76 Update branch name from 8-7-stable to 8-8-stable 2016-05-24 10:17:40 +00:00
Chris Wilson 3258ad60cb Update Google integration API workflow 2016-05-23 18:35:04 +00:00
Achilleas Pipinellis 68b8e86a81 Merge branch 'container-registry-user-docs' into 'master' 
Initial version of user documentation of container registry

cc @axil


See merge request !4244
 2016-05-23 17:38:13 +00:00
Achilleas Pipinellis c49f5f7335 Copyedit Registry user docs 2016-05-23 12:31:52 -05:00
Achilleas Pipinellis 526da93052 Fix link to container Registry user docs 2016-05-23 11:47:19 -05:00
Jacob Vosmaer 3fa32fa2d5 Use gitlab-workhorse 0.7.3 2016-05-23 16:36:00 +02:00
Kamil Trzcinski 8ed9b6aa7a Initial version of user documentation of container registry 2016-05-22 23:12:32 -05:00
Achilleas Pipinellis c01f99b768 Fixes suggested by Kamil 2016-05-22 19:53:19 -05:00
Achilleas Pipinellis f896a4e0c1 Refactor storage location section 2016-05-22 19:34:52 -05:00
Achilleas Pipinellis b565cfa50f Fix remaining docs on enabling/disabling Registry 2016-05-22 18:52:42 -05:00
Achilleas Pipinellis e955f49fb7 Fix Registry docs now that it is not enabled be default 2016-05-22 17:23:30 -05:00
Achilleas Pipinellis 27067e565f Clarify how the Registry is enabled in Omnibus 2016-05-22 14:54:29 -05:00
Achilleas Pipinellis e9817f21f4 Major overhaul of the Registry admin docs 2016-05-22 14:54:29 -05:00
Achilleas Pipinellis c6cd07ba3a Add link to container registry 2016-05-22 14:47:52 -05:00
Achilleas Pipinellis 0cdc080a4a Refactor container docs 2016-05-22 14:47:52 -05:00
Achilleas Pipinellis 0695cdee17 Add assumptions section and refactor domain configuration 2016-05-22 14:47:52 -05:00
Achilleas Pipinellis 04d231ef87 Rearrange configuration parts 2016-05-22 14:47:52 -05:00