home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,091 Commits 48 Branches 340 Tags
23293de23e62c2ce6341d73f200a03cbcef82dfb
Commit Graph
14091 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 23293de23e Merge branch 'group_membership_lock' into 'master' 
Group membership lock

Fixes gitlab/gitlabhq#1591

See merge request !268
 2014-12-17 09:16:02 +00:00
Marin Jankovski 6ab5127bfa Merge branch 'master' into group_membership_lock 
Conflicts:
	db/schema.rb
 2014-12-16 14:34:32 +01:00
Dmitriy Zaporozhets db49b2d8bb Merge branch 'ce-7-6' into 'master' 
Changes from CE 7.6

See merge request !270
 2014-12-16 13:22:13 +00:00
Dmitriy Zaporozhets dc0e6d06c5 Merge branch 'master' into ce-7-6 2014-12-16 13:21:18 +02:00
Dmitriy Zaporozhets 7b928de03b Merge branch 'kerberos_ee' into 'master' 
Kerberos support

https://dev.gitlab.org/gitlab/gitlabhq/issues/1414

Ability to login using kerberos credentials

![Screen Shot 2014-12-12 at 21.06.01](https://dev.gitlab.org/uploads/gitlab/gitlab-ee/cdc0fb7ee9/Screen_Shot_2014-12-12_at_21.06.01.png)

Ability to attach kerberos account

![Screen Shot 2014-12-12 at 21.19.23](https://dev.gitlab.org/uploads/gitlab/gitlab-ee/e926fb3798/Screen_Shot_2014-12-12_at_21.19.23.png)

See merge request !267
 2014-12-16 10:45:29 +00:00
Marin Jankovski fd8725223b Merge branch 'master' into group_membership_lock 
Conflicts:
	CHANGELOG-EE
 2014-12-16 11:38:39 +01:00
Marin Jankovski 0e9f0a1cdd Limit to only additions and block at project team level. 2014-12-16 10:01:37 +01:00
Patricio Cano f023db2b47 Merge branch 'update_changelog_7_6' into 'master' 
Update changelog 7.6

See merge request !1327
 2014-12-15 19:45:28 +00:00
Valery Sizov 842ac35ae4 Update changelog 2014-12-15 20:22:18 +02:00
Valery Sizov 73c0dfd265 Kerberos: username as identifier 2014-12-15 18:07:03 +02:00
Valery Sizov cbabc0b2f3 Kerberos: update docs 2014-12-15 18:07:03 +02:00
Valery Sizov 451a078a9b EE changelog 2014-12-15 18:07:03 +02:00
Valery Sizov e3a419aa64 Kerberos: specs 2014-12-15 18:06:17 +02:00
Valery Sizov 8a7993194e Kerberos support 2014-12-15 18:06:17 +02:00
Dmitriy Zaporozhets a64d0f7917 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-12-15 17:25:50 +02:00
Dmitriy Zaporozhets ee54e56f7d Merge branch 'kerberos_dependency' into 'master' 
Kerberos dependency

See merge request !1324
 2014-12-15 15:17:37 +00:00
Dmitriy Zaporozhets f8ea016486 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-15 17:06:11 +02:00
Dmitriy Zaporozhets 14ab0228a8 Merge branch 'fix-note-update' into 'master' 
Fix note update

In some strange cases Ruby thinks `system` is not AR field but
Kernel.system call and raises exception during save. It should prevent
this random wierd behaviour.

Exception log:

```
ArgumentError (wrong number of arguments (0 for 1+)):
  app/models/note.rb:505:in `system'
  app/models/note.rb:505:in `editable?'
  app/controllers/projects/notes_controller.rb:33:in `update'
```

See merge request !1326
 2014-12-15 15:05:22 +00:00
Patricio Cano c97baeb9f9 Merge branch 'update_changelog' into 'master' 
Update changelog

keep in mind that there is unmerged MR without updating changelog https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/268

See merge request !269
 2014-12-15 14:42:55 +00:00
Dmitriy Zaporozhets 4ab728bfe8 Fix random Argument error when update note 
In some strange cases Ruby thinks `system` is not AR field but
Kernel.system call and raises exception during save. It should prevent
this random wierd behaviour

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 16:31:23 +02:00
Valery Sizov 16651968d5 update ee-changelog 2014-12-15 15:59:14 +02:00
Marin Jankovski 4ec4bd29c6 Add to member lock to changelog and documentation. 2014-12-15 14:55:55 +01:00
Marin Jankovski 3257f8fcce Do not allow adding users via api if member lock is enabled. 2014-12-15 13:25:31 +01:00
Marin Jankovski 6c656c759f Move the checkbox to a better position. 2014-12-15 13:25:03 +01:00
Valery Sizov 83de96ae3a add kerberos dependency 2014-12-15 14:01:55 +02:00
Sytse Sijbrandij d37bdd0ccd Merge pull request #8446 from jvanbaarsen/added-process-for-green-tests 
Added process for green tests
 2014-12-15 10:52:08 +01:00
Marin Jankovski 3d4a3fc4d1 Add feature spec for group membership locking. 2014-12-15 10:44:34 +01:00
Jeroen van Baarsen 5ad463e0e8 Rephrase of the text 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-15 10:41:30 +01:00
Marin Jankovski 2948a2afbc Add membership_lock to allowed params. Change settings page warning. 2014-12-15 10:32:53 +01:00
Dmitriy Zaporozhets 19865b7cfd Merge pull request #8448 from jvanbaarsen/fixed-already-defined-messages 
Fixed a lot of already defined notices
 2014-12-15 11:14:31 +02:00
Sytse Sijbrandij 9fc739e5d0 Merge pull request #8447 from jvanbaarsen/added-code-of-conduct 
Added Code of Conduct
 2014-12-15 09:34:54 +01:00
Jeroen van Baarsen be206a5142 Merge pull request #8410 from tricknotes/add-webhook-doc-for-tag-event 
Add missing webhook doc for tag event
 2014-12-14 18:35:31 +01:00
Jeroen van Baarsen 6b1f2e4339 Added Code of Conduct 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-14 18:34:23 +01:00
Jeroen van Baarsen ba4fe47606 Merge pull request #8374 from bbodenmiller/7-5-update-fix 
remove extra upgrade details, add missing config
 2014-12-14 18:31:37 +01:00
Ryunosuke SATO d11e048d7f Add missing webhook doc for tag event 2014-12-14 23:47:13 +09:00
Jeroen van Baarsen 4eb3c47d4e Fixed a lot of already defined notices 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-14 15:13:09 +01:00
Jeroen van Baarsen ed7b3f84ae Merge pull request #8429 from zertrin/fix-typo-in-docker-readme-1 
Fix typo in the README.md for docker
 2014-12-14 14:49:48 +01:00
Jeroen van Baarsen 0cfca15292 Added process for green tests 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-13 20:09:26 +01:00
Jeroen van Baarsen 3615b4de24 Merge pull request #8359 from bbodenmiller/patch-1 
add details on backing up your SSH host keys
 2014-12-13 17:24:56 +01:00
Dmitriy Zaporozhets 2497273030 Update CHANGELOG with snippet validation change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 16:35:05 +02:00
Dmitriy Zaporozhets ff65e55694 Merge branch 'sanitize-snippet-file-name' into 'master' 
Validate and sanitize snippet file name

Fixes #1816

See merge request !1322
 2014-12-12 14:31:51 +00:00
Dmitriy Zaporozhets bfebab1c10 Fix snippet factory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 15:55:06 +02:00
Marin Jankovski c115d08055 Prevent adding users to project team if group membership lock is in place. 2014-12-12 14:25:58 +01:00
Marin Jankovski 9c99c4fe5c Show different controls on project member page depending on if the membership lock is in place. 2014-12-12 14:24:17 +01:00
Marin Jankovski c19248a285 Add group membership lock field to namespaces. 2014-12-12 13:52:36 +01:00
Dmitriy Zaporozhets 29c0cf9186 Update EE changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 14:30:33 +02:00
Dmitriy Zaporozhets 177c89b8b8 Merge branch 'ce-changes' into 'master' 
CE changes from upstream

See merge request !266
 2014-12-12 12:25:36 +00:00
Dmitriy Zaporozhets 8eb29cd5d6 Fix db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:32:15 +02:00
Dmitriy Zaporozhets 118bd7178b Sanitize snippet file name in raw headers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:28:48 +02:00
Dmitriy Zaporozhets f28a12a559 Add strict validation to snippet file names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:15:42 +02:00