Commit Graph
2406 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 07703c22b3 Improve approve MR widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-12 16:00:25 +02:00
Dmitriy Zaporozhets 33dce2df6f Merge branch 'ce-to-ee' into 'master'
CE to EE

See merge request !419
2015-06-12 12:59:48 +00:00
Dmitriy Zaporozhets 89ac4f1d56 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project.rb
2015-06-12 14:01:20 +02:00
Dmitriy Zaporozhets 896eb0aa13 Imporove LDAP documentation
If user was blocked in Active Directory - user will be automatically blocked in GitLab during next Daily sync.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-12 12:15:08 +02:00
Jacob Vosmaer f0ecdf5e24 Fix link to howto_rc1.md
The relative link that was there before breaks when you copy-paste the
issue template into an actual issue.
2015-06-12 12:09:50 +02:00
Dmitriy Zaporozhets f840903112 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/tab_helper.rb
	app/models/merge_request.rb
	app/views/layouts/nav/_project_settings.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	doc/api/groups.md
2015-06-12 11:16:28 +02:00
Sytse Sijbrandij 8f142c4aae Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-11 18:06:57 +02:00
Job van der Voort a7a4ae69d4 Merge branch 'info_about_namespaces' into 'master'
Info about namespaces

Added info about namespaces in groups.

Because of tweet https://twitter.com/kaystrobach/status/603912904757420032

See merge request !1835
2015-06-11 15:21:28 +00:00
Dmitriy Zaporozhets 148178fb98 Merge branch 'rs-issue-1758' into 'master'
Update grids for 2FA details

Also adds a link to the documentation.

Closes #1758

See merge request !795
2015-06-11 15:00:08 +00:00
Dmitriy Zaporozhets 491dc6506f Documentation for approval feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 16:06:57 +02:00
Job van der Voort 7872c7ff62 fix and minify images 2015-06-11 15:12:47 +02:00
Job van der Voort 9a4886f0a0 move and fix links importing docs 2015-06-11 14:45:48 +02:00
Robert Speicher fbdcaebcd1 Fix "Acount" typo in 2FA docs
[ci skip]
2015-06-10 17:11:04 -04:00
Karen Carias 41a21912c6 added links to API calls 2015-06-10 17:07:55 +00:00
Karen Carias fd9849ebba fixed links 2015-06-10 03:19:40 +00:00
Sytse Sijbrandij 3d219ca395 Merge branch 'release-time' into 'master'
set the release time

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

Conflicts:
	doc/README.md
	doc/workflow/README.md
2015-06-09 19:24:37 +02:00
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
Karen Carias ed42be4019 fixed link 2015-06-08 21:03:57 +00:00
Karen Carias 60ac9253ad fixed link 2015-06-08 21:01:56 +00:00
Karen Carias b4116e76cb Removed link "importing to gitlab" because it's in "Documentation". Organized links in alphabetical order. 2015-06-08 20:55:42 +00:00
Karen Carias 0ea9c962a4 added link to "importing to GitLab". Also organized docs in alphabetical order. 2015-06-08 20:48:06 +00:00
Karen Carias 44aaf40ad3 fixed numbers 2015-06-08 20:37:28 +00:00
Karen Carias 0c538cd8b5 fixed numbers 2015-06-08 20:36:28 +00:00
Karen Carias fc9d90c379 fixed numbers 2015-06-08 20:35:53 +00:00
Karen Carias e150ab9cee Added info about milestones and wiki pages not imported from Bitbucket 2015-06-08 20:31:02 +00:00
Karen Carias ce7831ae39 fixed importing link 2015-06-08 20:26:58 +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 bcde45893b update with suggestions 2015-06-08 16:23:37 +02:00
Job van der Voort c5555e9b21 set the release time 2015-06-08 14:45:24 +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