Commit Graph
2376 Commits
Author SHA1 Message Date
Douwe Maan d7d3a2885f Merge branch 'feature/ldap_group_link_api' into 'master'
Add API support for adding and removing LDAP group links

See merge request !4
2015-06-09 09:27:39 +00:00
Dmitriy Zaporozhets a83d0034e3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md
2015-06-08 18:24:34 +02:00
Job van der Voort b368d4a1d1 fix spacing in document 2015-06-08 16:37:04 +02:00
Job van der Voort 8a32c46e6e importing documents renewed 2015-06-08 16:35:03 +02:00
Job van der Voort c857c7ff1c fix conflicts 2015-06-08 12:00:22 +02:00
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 c8a845b200 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-06-05 18:19:38 +02:00
Dmitriy Zaporozhets b6aa7cbccd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-05 18:19:17 +02:00
Douwe Maan 07381fd238 Merge branch 'feature/ldap_sync_keeps_last_owner' into 'master'
Prevent LDAP group sync from removing a group's last owner

As discussed with Patricio in support request 3151

When setting up LDAP group sync, users can easily lock themselves out of their own group (cf. http://doc.gitlab.com/ee/integration/ldap.html#locking-yourself-out-of-your-own-group). The group may be left without any owner and requires intervention of the GitLab Administrators - a significant burden for a large deployment. In order to avoid this situation, this patch prevents the LDAP group sync from removing the last owner of a group, in the same way GitLab does not allow removing the last owner of a group via the Members page. This "last owner" is left in place until a new owner is nominated, the next sync after that will remove him/her.

See merge request !7
2015-06-05 14:11:11 +00: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
Job van der Voort af1f22adad update reference to deprecated repo and update guide 2015-06-05 13:39:28 +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 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
2015-06-05 11:40:36 +02:00
Alex Lossent 7a52573681 Prevent LDAP group sync from removing a group's last owner 2015-06-05 11:06:08 +02: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
Marc Radulescu 3963d31041 fix typo 2015-06-01 08:52:00 +00: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
Karen Carias a574e935fc fixed description 2015-05-27 18:48:33 +00:00
Karen Carias b7818f1965 fixed name on link to make it easier to find 2015-05-27 18:46:57 +00:00
Karen Carias 8a0221c7bd changed the document name to make it more useful 2015-05-27 18:44:47 +00: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
Alex Lossent 61e1ea700a Add API support for adding and removing LDAP group links 2015-05-26 19:30:48 +02: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