home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 04:36:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
31,846 Commits 48 Branches 340 Tags
master
Commit Graph
233 Commits
Author SHA1 Message Date
Timothy Andrew 5de79c4f53 Add documentation for wildcard protected branches. 2016-07-05 11:06:15 +05:30
Rémy Coutable 8625bd3622 Improve the request / withdraw access button 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-07-01 12:48:54 +02:00
Rémy Coutable ce6635406c Make GH one-off auth the default again for importing GH projects 
Advertise the PAT as an alternative unless GH import is not configured.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-30 18:48:17 +02:00
Eric K IdemaandRémy Coutable 12aa1f898d Import from Github using Personal Access Tokens. 
This stands as an alternative to using OAuth to access a user's Github
repositories.  This is setup in such a way that it can be used without OAuth
configuration.

From a UI perspective, the how to import modal has been replaced by a full
page, which includes a form for posting a personal access token back to the
Import::GithubController.

If the user has logged in via GitHub, skip the Personal Access Token and go
directly to Github for an access token via OAuth.
 2016-06-30 18:48:17 +02:00
Douwe Maan 1d34ce13fc Merge branch 'issue_3359_3' into 'master' 
Insert notification settings dropdown into groups

## Display notification settings dropdown for groups

part of #3359   

![groups](/uploads/d61648236b81b0cca55fa2d73758f0df/groups.png)
![Screenshot_from_2016-06-29_10-58-37](/uploads/7be05ea6002932c094a81b25a308fd62/Screenshot_from_2016-06-29_10-58-37.png)  
![small](/uploads/6f2b556d734c870e358f6f56618a0bab/small.png)

See merge request !4857
 2016-06-29 19:23:03 +00:00
Felipe Artur d2971315ab Merge branch 'master' into issue_3359_3 2016-06-29 11:32:38 -03:00
Felipe Artur 36d48120f6 merge master into issue_3359_3 2016-06-29 11:04:18 -03:00
Peter Dave Hello 9e6f99744e optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
Robert Speicher cb0283d218 Merge branch 'inline-todos-docs' into 'master' 
Update Todos documentation and screenshots to include new functionality.

Updates documentation for todos, includes updated and new screenshots.

See also !4502 and #18906 

Closes #18923

[ci skip]

See merge request !4840
 2016-06-22 17:06:49 +00:00
Connor Shea ac212b9ca4 Finish my sentence. [ci skip] 2016-06-22 08:49:40 -06:00
Achilleas Pipinellis 6f6c6f68ea Merge branch 'doc_refactor_labels' into 'master' 
Refactor labels docs

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18555

See merge request !3347
 2016-06-22 12:18:47 +00:00
Connor Shea ea9c0277ab Update Todos documentation and screenshots to include new functionality. 
Add information about manually creating Todos from issue and merge request sidebars.

[ci skip]
 2016-06-21 14:55:36 -06:00
Connor Shea a6faaace05 Expand on Award Emoji documentation, update/add screenshots. [ci skip] 2016-06-21 14:10:00 -06:00
Achilleas Pipinellis 8195deb8a6 Move labels documentation to new location 
Due to https://gitlab.com/gitlab-org/gitlab-ce/issues/3349
 2016-06-21 18:54:30 +02:00
Achilleas Pipinellis 67d6d96429 Add info on tooltips 
[ci skip]
 2016-06-21 18:49:00 +02:00
Achilleas Pipinellis cd28597c82 Refactor labels docs 
[ci skip]
 2016-06-21 18:49:00 +02:00
Jacob Schatz 1147f6406f Merge branch 'lbennett/gitlab-ce-18114-add-up-arrow-edit-shortcut-documentation' into 'master' 
Documented the up key shortcut

## What does this MR do?

Documents the `up` key edit note shortcut in the `/help/_shortcuts.html.haml` help pane and the `/doc/workflow/shortcuts.png` screenshot.

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

The issue and MR shortcuts should be merged, they're the same? Shall I open an issue or include here?

This panel also need to be a little more responsive. Shall I open an issue or include here?

Additionally, I have some conflicts regarding the screenshot. This screenshot also needs to update for !4570.

## Why was this MR needed?

Everyone should know about this awesome shortcut.

## What are the relevant issue numbers?

Closes #18114.

## Screenshots (if relevant)

View the [updated screenshot](https://gitlab.com/gitlab-org/gitlab-ce/blob/e7221ad66efeb0f7d263ead7ed523d194243fb09/doc/workflow/shortcuts.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4758
 2016-06-20 20:19:08 +00:00
Achilleas Pipinellis 503bbcc3e7 Merge branch '18584-document-request-access-feature' into 'master' 
Document access request to project & group

## What does this MR do?

Adds documentation that was missing from !3798.

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

I've taken the opportunity to update the images in the "Project users" documentation page, I can remove the commit if it's not welcome!

## What are the relevant issue numbers?

Closes #18584.

## Does this MR meet the acceptance criteria?

- [ ] Tests
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

/cc @DouweM 

See merge request !4685
 2016-06-20 18:45:25 +00:00
Felipe Artur e5aa902860 Merge master into issue_12758 2016-06-17 14:29:11 -03:00
Luke "Jared" Bennett e7221ad66e Added shortcut to help shortcuts view 
Updated shortcuts.png for docs

Updated CHANGELOG

Moved CHANGELOG entry

updated shortcut docs
 2016-06-17 18:07:09 +01:00
Felipe Artur 33c61bd461 Re-use notifications dropdown/modal for user profile 2016-06-17 00:17:20 -03:00
Rémy Coutable 4869bdf793 Update images for the 'Project users' documentation 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-15 19:15:55 +02:00
Rémy Coutable 152af3895e Add documentation for the 'request access to group' feature 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-15 19:15:55 +02:00
Rémy Coutable 33684eef83 Add documentation for the 'request access to project' feature 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-15 19:15:55 +02:00
Felipe Artur 89a2c8730b Implement custom notification level options 2016-06-15 11:47:50 -03:00
Felipe Artur 0cf0352303 Add notification settings documentation and update screenshot 2016-06-13 15:51:11 -03: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
Douwe Maan a97cb8f8b8 Merge branch 'issue_9013' into 'master' 
Let users set notification levels in projects which they are not members

Fixes #9013 

See merge request !3986
 2016-05-20 21:04:55 +00:00
Hannes Rosenögger 3019ab99bc Merge branch 'patch-1' into 'master' 
doc: fix git lfs workaround for using http instead of https

the url should only point to `info/lfs` instead of `info/lfs/batch/objects`

See merge request !2713
 2016-05-18 20:42:15 +00:00
Felipe Artur fc9844e8e1 Update documentation 2016-05-17 21:54:06 -05:00
Achilleas Pipinellis 9eb4569ed9 Change all occurrences of doc.gitlab.com to docs.gitlab.com 
[ci skip]
 2016-05-13 16:26:56 -05:00
Achilleas Pipinellis 8b2cdceda6 Merge pull request #9953 from cmckni3/update-lfs-documentation 
Update git lfs initialize command
 2016-05-08 11:39:38 +03:00
Alfredo Sumaran 0392dffdb6 Update wording 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 5d5df26ab1 Add documentation for "Hide whitespace changes" button 2016-04-26 14:01:40 -05:00
Jacob Schatz d809507e05 Merge branch 'issue_14904' into 'master' 
Add new shortcuts

Closes #14904

- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.

See merge request !3686
 2016-04-25 19:13:25 +00:00
Achilleas Pipinellis 15e225940b Merge branch 'doc-gh-import-additions' into 'master' 
Add newest enhancements to GH importer docs

[ci skip]

See merge request !3867
 2016-04-22 08:36:37 +00:00
Achilleas Pipinellis 846a9ef5ad Add newest enhancements to GH importer docs 
[ci skip]
 2016-04-22 11:20:37 +03:00
Achilleas Pipinellis de39959f55 Use new Note styleguide 
[ci skip]
 2016-04-22 10:42:30 +03:00
Alfredo Sumaran a45924348f Merge remote-tracking branch 'origin/master' into issue_14904 2016-04-20 12:24:42 -05:00
Douwe Maan 55380e69fc Merge branch 'pmq20/gitlab-ce-issue_12785' 2016-04-19 18:25:42 +02:00
Alfredo Sumaran 29734516e1 Update shortcuts image 2016-04-18 15:03:36 -05:00
Con Vissenberg fce97dfce7 "git lfs init" is deprecated, use "git lfs install" instead. 2016-04-18 08:15:15 +00:00
P.S.V.R 3d6ba3b107 Add support to cherry-pick any commit 
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
 2016-04-18 15:39:07 +08:00
Zeger-Jan van de Weg 0385cd5a58 Start with iid on branch creation 2016-04-14 14:49:45 +02:00
Achilleas Pipinellis 4a09a6c6f2 Move 'New branch from issue' feature doc to web_editor.md 
[ci skip]
 2016-04-13 11:31:06 +03:00
Chris McKnight 35266de2f0 Updates git lfs initialize command 2016-04-07 10:30:14 -05:00
Drew Blessing 2da8204ff5 Clarify LFS configuration 2016-03-24 10:00:27 -05:00
Achilleas Pipinellis e53707fc9e Refactor award emoji doc a bit 
[ci skip]
 2016-03-22 12:59:28 +02:00
Achilleas Pipinellis 1030ebb89f Add award emoji docs 
[ci skip]
 2016-03-22 11:50:16 +02:00
Anatoly Borodin 6c06b65d1e Use relative links in doc, fix broken generated HTML links 
Links like (doc/web_hooks/web_hooks.md) work in the GitLab source code
web interface, but the HTML generator produces broken links in the `doc`
subdirectories:
http://doc.gitlab.com/ce/hooks/doc/web_hooks/web_hooks.html
instead of the right one
http://doc.gitlab.com/ce/web_hooks/web_hooks.html
in
http://doc.gitlab.com/ce/hooks/custom_hooks.html.

Fixes #14338

[ci skip]

Signed-off-by: Anatoly Borodin <anatoly.borodin@gmail.com>
 2016-03-17 00:35:53 +01:00