home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,879 Commits 48 Branches 340 Tags
ebaa1e5a89b39e2e95ee2c6d485e6bb094e2bd9f
Commit Graph
1993 Commits
Author SHA1 Message Date
Sytse Sijbrandij 509fe1159a Merge branch 'master' into 'master' 
Doc: Added FreeOTP to 2FA

I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication.

See merge request !777
 2015-06-06 13:11:01 +00:00
rugk 975d110688 Changed spelling 2015-06-06 12:34:40 +00:00
Jacob Vosmaer 7c09da9e8f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-06-05 19:23:38 +02:00
Jacob Vosmaer 0e8296fd56 Make unicorn docs discoverable 2015-06-05 19:23:10 +02:00
Dmitriy Zaporozhets b6aa7cbccd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-05 18:19:17 +02:00
rugk 507ebb701a Escaped(?) 2015-06-05 13:18:05 +00:00
rugk 193f019f61 Added free alternative to Google Authenticator (FreeOTP). 2015-06-05 13:16:47 +00:00
Jacob Vosmaer d98bcb9ca9 Try to explain Unicorn and unicorn-worker-killer 2015-06-05 14:23:35 +02:00
Douwe Maan bdfd163aa1 Add info about WIP merge requests to docs. 2015-06-05 13:12:55 +02:00
Douwe Maan 1f78aeba40 Merge branch 'improve_bitbucket_docs' into 'master' 
Improve BitBucket integration documentation [ci skip]

This MR will improve the BitBucket integration documentation by

- mentioning the need to reconfigure GitLab after changing the configuration file, if you're using the omnibus package.
- adding a section about configuring a Host entry for bitbucket.org.
- switching additional steps 1 and 2, because connecting to BitBucket will only work after you added the SSH key and the Host entry.
- using sudo for the ssh connection in step 2, so that it is more obvious, that the git account should be used to establish the connection.

See merge request !670
 2015-06-05 10:05:09 +00:00
Dmitriy Zaporozhets b9219469f7 Merge branch 'make-namespaces-api-available-to-all-users' into 'master' 
Make namespace API available to all users

### What does this MR do?

This MR makes it possible for a user to query namespaces to which he/she has access. Also, it adds documentation for the existing API.

### Why was this MR needed?

Even though the `groups` API exists, it might still be useful to have an endpoint that tells the namespace type (e.g. `user` vs. `group`), especially if a user has access to a number of different projects.

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9328

See merge request !708
 2015-06-04 15:59:17 +00:00
Job van der Voort 83e59db55e Merge branch 'rs-2fa-docs' into 'master' 
Add 2FA docs

See merge request !757
 2015-06-03 15:05:54 +00:00
Dmitriy Zaporozhets 8046b69761 Merge branch 'remove_unecessary_rake_task' into 'master' 
Remove gitlab:env:check task.

Rake task that checks for git user git settings is a leftover from early days.

It is not being used by the web editor(and web editor is also being redone atm) so this rake task just causes confusion.

Adresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2362

See merge request !758
 2015-06-03 14:59:38 +00:00
Marin Jankovski 7044d649a3 Add autocrlf back to installation docs, add a check for it. 2015-06-03 15:42:22 +02:00
Job van der Voort 41ee2aa2d7 fix typo and add screenshots 2015-06-03 15:35:13 +02:00
Jacob Vosmaer 98ff4131cd LDAP users should not control their LDAP email 2015-06-03 13:40:47 +02:00
Marin Jankovski 5f7d6c7d74 Remove gitlab:env:check task. 2015-06-03 11:26:57 +02:00
Robert Speicher 42f3626862 Add 2FA docs 
[ci skip]
 2015-06-02 18:39:30 -04:00
Stan Hu 85145d1d77 Disable changing of the source branch in merge request update API 2015-05-29 09:40:35 -07:00
Douwe Maan 70b29c3576 Merge branch 'feature/saml_support' into 'master' 
Add SAML support via Omniauth

Split of !669, with doc

See merge request !722
 2015-05-29 10:37:27 +00:00
Stan Hu 67992b9be6 Make namespace API available to all users 
Closes https://github.com/gitlabhq/gitlabhq/issues/9328
 2015-05-28 11:39:12 -07:00
Alex Lossent 22de5443c5 Add SAML support via Omniauth 2015-05-27 16:38:10 +02:00
Stefan Schweter 8313aa6da8 Adds new section for changing time zone in GitLab configuration file. New section added for changing time zone in Omnibus installations. 2015-05-27 14:06:40 +02:00
Jeroen van Baarsen 8044b4d278 Merge branch 'master' into 'master' 
ADD: Note on how to setup dns hostname resolution to installation manual

Hi,

I'm suggesting to add the following note to the installation instructions. It took me some time to figure out why the test failed and why I wasn't able to push. The error messages did not point into the right direction so this might help other people with the same problems.

I hope my english is good enough, if not, please feel free to rephrase anything.

Thank you in advance,

Holger Segnitz

See merge request !236
 2015-05-27 07:11:44 +00:00
Dmitriy Zaporozhets ebe0aef269 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-26 16:41:15 +03:00
Job van der Voort 109a3684f0 Merge branch 'backup_gitlab.com' into 'master' 
Added note about backups for gitlab.com

Added note about backups for Gitlab.com based on question on Twitter
https://twitter.com/MarcelloLins/status/598544357294272513

See merge request !1828
 2015-05-26 07:22:38 +00:00
Karen Carias 2b4eb7869e Explained info better 2015-05-26 01:18:24 +00:00
Robert Speicher fdde284c97 Document expanded autolinking in doc/markdown/markdown.md 2015-05-25 16:22:46 -04:00
Karen Carias 01c4683473 small fix 2015-05-25 19:56:11 +00:00
Douwe Maan 2d0a9c4cc2 Merge branch 'add-webhook-note-events' into 'master' 
Add support for Webhook note events

This MR adds support for note events (comments) for WebHooks.

Perhaps the only potential source of confusion is that the settings indicates "Note Events" instead of "Comments". What do you think?

Screenshot after:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/299b141d82f7b14943a74258d5c57ca6/image.png)

Closes https://github.com/gitlabhq/gitlabhq/issues/6745

See merge request !673
 2015-05-25 07:57:52 +00:00
Karen Carias 0c14044203 fixed link 2015-05-22 23:12:12 +00:00
Karen Carias 43a11f4b53 Added link to keyboard shortcuts 2015-05-22 23:11:36 +00:00
Karen Carias dffc313bb5 test1 image 2015-05-22 23:08:50 +00:00
Karen Carias 920b547d63 keyboard shortcuts in GitLab 2015-05-22 23:08:12 +00:00
karen Carias fdc9ae7ca2 picture for shortcuts 2015-05-22 15:57:29 -07:00
Job van der Voort 33dbb30fb4 notify the core team and devs 2015-05-22 15:19:06 +02:00
Stan Hu deeff56967 Add support for Webhook note events 
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
 2015-05-21 23:48:16 -04:00
Karen Carias 9622348bed Added note about backups for gitlab.com 2015-05-21 21:39:00 +00:00
Karen Carias 1132b3e8dc Link to change your time zone in Gitlab CE 2015-05-21 20:05:39 +00:00
Karen Carias 871c90c3d1 Added instructions to change time zone in GitLab CE 2015-05-21 20:03:25 +00:00
Jacob Vosmaer 5483c2b0a9 How to dump a production DB to staging 2015-05-18 13:37:43 +02:00
Patrick FeyandFeyP d6b901a72d Improve BitBucket integration documentation [ci skip] 2015-05-15 18:37:15 +02:00
Douwe Maan fab9cbf98d Update installation/update guides for 7.11. 2015-05-15 13:12:54 +02:00
Valery Sizov 7471047104 update API doc 2015-05-14 16:30:27 +03:00
Sytse Sijbrandij cc0a4b7ee8 Merge requests are welcome in spite of the deprecation. 2015-05-13 12:16:05 +00:00
Dmitriy Zaporozhets 5dcbe6f4ba Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-13 14:27:02 +03:00
Sytse Sijbrandij 82dec4b49b remove strange code branchets 2015-05-13 10:08:48 +00:00
Sytse Sijbrandij cfef2a11d9 Deprecate the upgrader script since we forget to update it. 2015-05-13 10:08:04 +00:00
Jeroen van Baarsen 892158f136 Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commit 
Call merge request web hook for each commits
 2015-05-13 11:57:33 +02:00
Marin Jankovski 700e5117cd Merge branch 'code-defreeze' into 'master' 
defreeze code

Fixes #2166.

See merge request !1820
 2015-05-13 09:10:47 +00:00