home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,741 Commits 48 Branches 340 Tags
fcbb14f6b79ea4d97078ebae9df9a0fc4bba021e
Commit Graph
3649 Commits
Author SHA1 Message Date
Kamil Trzcinski 0fab7b11ba Merge remote-tracking branch 'origin/master' into artifacts-when 2016-06-13 16:05:43 +02:00
Achilleas Pipinellis aa48eeef17 Merge branch 'doc-styleguide-move-locations' into 'master' 
Add guide on changing a document's location

## What does this MR do?

Add a documentation styleguide when changing a document's location.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/3349


See merge request !4624
 2016-06-13 13:26:43 +00:00
Achilleas Pipinellis cb7fa10cb5 Change to new Notes styleguide 
[ci skip]
 2016-06-13 15:04:22 +02:00
Achilleas Pipinellis d1abbb3b66 Add guide on changing a document's location 
[ci skip]
 2016-06-13 15:00:28 +02:00
Achilleas Pipinellis e489e9a585 Change logs.md location in README 
[ci skip]
 2016-06-13 14:19:29 +02:00
Achilleas Pipinellis 35e9fc9865 Move logs/logs.md to administration/logs.md 
[ci skip]
 2016-06-13 13:52:20 +02:00
Stan Hu a85dde9182 Fix Error 500 when using closes_issues API with an external issue tracker 
Closes #18484
 2016-06-11 19:50:08 -07:00
Kamil Trzcinski 3714e1914b Improve after review 2016-06-10 21:25:48 +02:00
Achilleas Pipinellis 2ff359142a Merge branch 'fix-registry-docs' into 'master' 
Fix incorrect registry key value



See merge request !4595
 2016-06-10 14:21:49 +00:00
Achilleas Pipinellis 0e7abb4c28 Fix incorrect registry key value 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18441
 2016-06-10 15:53:56 +02:00
Rémy Coutable 282674c110 Add documentation for the 'only_allow_merge_if_build_succeeds.rb' feature 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-10 14:36:57 +02:00
Kamil Trzcinski e6209a407e Added description of artifacts:when 2016-06-10 13:26:36 +02:00
Jacob Schatz 2268c6c70e Merge branch 'dz-improve-ui-consistency' into 'master' 
Improve ui consistency

* Decline idea of using gray buttons actively in UI
* remove icons from some buttons that already has text
* standardizes margin between buttons 


First step in https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 

See merge request !4533
 2016-06-08 20:51:52 +00:00
Robert Speicher 0cfa368bf8 Fix version references in 8.8 to 8.9 update guide 
[ci skip]
 2016-06-08 14:20:46 -04:00
Dmitriy Zaporozhets 366ad9ff72 Reject idea of using white/gray button depends on bg color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-08 17:11:43 +03:00
Yorick Peterse b5464726aa Added 8.9 install/update guides 
[ci skip]
 2016-06-07 15:20:40 +02:00
Connor Shea b2e85b7968 Add relevant commands to the licensing document, resolve some feedback. 2016-06-06 13:39:36 -06:00
Connor Shea 7045b9e908 Make sure to mention the GNU Project and OSI-provided information regarding the GPL so no one tries to disagree with that decision. 2016-06-06 13:39:36 -06:00
Connor Shea 3c32341215 Add Licensing information and guidelines to the Documentation. 2016-06-06 13:39:36 -06:00
Timothy Andrew 09a2f2dbdc Add documentation for U2F registration & authentication. 2016-06-06 12:50:31 +05:30
Mark Fletcher 2e8f039ae9 Document the API endpoint for gathering a build log 
* Resolves #18015
 2016-06-03 18:56:26 +01:00
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
Dmitriy Zaporozhets ae5f17ae2d Merge branch 'dz-more-ui-guides' into 'master' 
Add icons and buttons to UI guide

cc @jschatz1 @skyruler 

See merge request !4445
 2016-06-03 07:07:52 +00:00
Dmitriy Zaporozhets 814b26cfc3 Fix typo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-02 23:04:08 +03:00
Dmitriy Zaporozhets 33c499441a Add icons and buttons to UI guide 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-02 22:43:02 +03:00
Drew Blessing c1923aef04 Explicitly mention advisory file locking 2016-06-01 14:46:07 -05:00
Drew Blessing 91496a0965 Add gdb detach instructions 2016-06-01 14:44:29 -05:00
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