home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,123 Commits 48 Branches 340 Tags
f47dfe891dae44578670b02ff68b62cd46ff98b7
Commit Graph
13123 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets f47dfe891d Merge branch 'ee-changelog' into '7-4-stable-ee' 
Added EE changelog

See merge request !204
 2014-10-17 17:02:36 +00:00
Valery Sizov 7e9ff1fc65 Add EE changelog 2014-10-17 19:58:28 +03:00
Valery Sizov 28477c49fa Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into 7-4-stable-ee 2014-10-17 17:09:32 +03:00
Dmitriy Zaporozhets b99eef4481 Merge branch 'ce_master' into 'master' 
CE master to EE master

See merge request !203
 2014-10-17 14:07:08 +00:00
Dmitriy Zaporozhets 5a4a1a2fa4 Merge branch 'fix-oauth-block' into 'master' 
Fix user being blocked after oauth sign-in

See merge request !1190
 2014-10-17 12:35:46 +00:00
Valery Sizov 39b229cf4c added uopdate guide 2014-10-17 14:14:35 +03:00
Dmitriy Zaporozhets f8cdd62e22 Fix account existing blocking 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 14:08:02 +03:00
Dmitriy Zaporozhets 966f68b33e Refactor error message a bit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 13:15:59 +03:00
Dmitriy Zaporozhets fd22d32bcd Merge branch 'issue-respect-single-sign-on' into 'master' 
Issue respect single sign on

Adds regression test for #1677

See merge request !1188
 2014-10-17 10:10:01 +00:00
Jan-Willem van der Meer d9bfebc0e8 Add regressiontest to verify allow_single_sign_on setting 
verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models
 2014-10-16 20:08:30 +02:00
Jan-Willem van der Meer fad588f2be Remove LDAP save test 
This is handled within the LDAP class
 2014-10-16 17:18:40 +02:00
Dmitriy Zaporozhets 8fbc081d15 Merge branch 'ce_upstream' into 'master' 
CE upstream

See merge request !202
 2014-10-16 14:01:48 +00:00
Dmitriy Zaporozhets 32d0bf3afd Fix snippets seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-16 16:50:09 +03:00
Dmitriy Zaporozhets 30ad50c96c Merge branch 'feature-migrate-to-multiple-ldaps' into 'master' 
Feature migrate to multiple ldaps

Still needs some documentation.

Basic flow:
- Upgrade to the newest EE
- Change gitlab.yml to include the server hash
- Run `rake gitlab:migrate_ldap_providers`

This will ensure all current ldap groups links will continue working.

See merge request !200
 2014-10-16 13:18:53 +00:00
Jan-Willem van der Meer 3193742dca Resolve merge conflits 2014-10-16 14:27:48 +02:00
Valery Sizov 7af04fe1b2 ce-upstream 2014-10-16 15:21:28 +03:00
Dmitriy Zaporozhets d6fdca9a88 Merge branch 'add_some_stuff_to_changelog' into 'master' 
Add a few items to changelog

See merge request !1187
 2014-10-16 11:57:49 +00:00
Dmitriy Zaporozhets de253100b5 Merge branch 'issue-respect-single-sign-on' into 'master' 
Issue respect single sign on

Fixes #1677 by making sure the per-build user is saved as well. Otherwise the user is passed to devise, and the user is saved afterwards, creating a successful signup.

See merge request !1186
 2014-10-16 11:51:48 +00:00
Valery Sizov 761c2a64cc Add items to changelog 2014-10-16 14:02:24 +03:00
Jan-Willem van der Meer ad95cc6430 Merge branch 'feature-multi-ldap-servers-group-sync' into feature-migrate-to-multiple-ldaps 2014-10-16 12:32:42 +02:00
Jan-Willem van der Meer 02fb3116d5 Add provider to LdapGroupLink tests 2014-10-16 12:28:47 +02:00
Jan-Willem van der Meer 8b98e9dc46 Make ldap group link factory valid 2014-10-16 12:11:08 +02:00
Jan-Willem van der Meer 92c184a57f Disallow new users from Oauth signup if allow_single_sign_on is disabled 
Because devise will trigger a save, allowing unsaved users to login, behaviour had changed.
The current implementation returns a pre-build user, which can be saved without errors.

Reported in #1677
 2014-10-16 11:46:40 +02:00
Dmitriy Zaporozhets 05922e71f4 Merge branch 'fix_project_number_ci' into 'master' 
Fix link to githost.io

Documentation pointed to wrong gitlab-ci project.

See merge request !222
 2014-10-16 09:35:09 +00:00
Jan-Willem van der Meer 104e146268 Merge branch 'feature-multi-ldap-servers-group-sync' into feature-migrate-to-multiple-ldaps 2014-10-16 10:46:17 +02:00
Jan-Willem van der Meer f4c64d44c2 Migrate LDAP users as well 2014-10-16 10:45:46 +02:00
Jan-Willem van der Meer 0ebe09e491 Only initialize if ldap is enabled 2014-10-16 10:32:54 +02:00
Jan-Willem van der Meer 18d87dcf91 Ensure each server block is a settingsLocic object 2014-10-16 10:32:29 +02:00
Jan-Willem van der Meer 09ccea3590 Remove duplicated comment 2014-10-15 22:42:51 +02:00
Achilleas Pipinellis c2bcdeb950 Make semaphore configuration an ordered list. 2014-10-15 20:52:39 +03:00
Achilleas Pipinellis b57ec54fae Point to correct project on githost.io. 2014-10-15 20:25:47 +03:00
Dmitriy Zaporozhets a0a826ebdc Merge branch 'note-omnibus-in-installation' into 'master' 
Note omnibus in installation

See merge request !1184
 2014-10-15 15:55:00 +00:00
Dmitriy Zaporozhets 5fc12561c1 Merge branch 'improve-lock-mr-ui' into 'master' 
Improve locked merge request UI

It allows us easily detect when MR get into lock state

Fixes UI part of #1674

See merge request !1183
 2014-10-15 14:32:52 +00:00
Sytse Sijbrandij e8e022daec Refer to the Omnibus installation from eveerywhere since people link to installation.md directly. 2014-10-15 16:29:05 +02:00
Dmitriy Zaporozhets 6536f6a04e Merge branch 'feature-multi-ldap-servers-merge-master' into 'master' 
Feature multi ldap servers

This adds the missing functions to get multiple LDAP servers to fully function

See merge request !198
 2014-10-15 14:04:30 +00:00
Jan-Willem van der Meer 7d3976eec4 Add task to migrate LDAP group links to multiple LDAP setup 
This still requires some additional documentation
 2014-10-15 15:28:54 +02:00
Dmitriy Zaporozhets 3f1c95c638 Merge branch 'no_red_builds_policy' into 'master' 
No red builds policy

Related to gitlab/organization#63

See merge request !1182
 2014-10-15 13:09:23 +00:00
Dmitriy Zaporozhets c926922ade Show merge in progress message if MR is locked 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-15 15:52:39 +03:00
Jan-Willem van der Meer b5430b8130 Properly fetch ldap groups 2014-10-15 14:52:07 +02:00
Jan-Willem van der Meer 9b678226a7 Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync 
Conflicts:
	db/schema.rb
	lib/api/ldap.rb
 2014-10-15 14:50:24 +02:00
Dmitriy Zaporozhets 381a6283a9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-15 15:35:08 +03:00
Dmitriy Zaporozhets 8200992991 Merge branch 'migrating_from_svn_doc' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/workflow/README.md
 2014-10-15 15:29:45 +03:00
Jan-Willem van der Meer 7b479156ec Merge remote-tracking branch 'origin/master' into feature-multi-ldap-servers-merge-master 2014-10-15 14:25:45 +02:00
Jan-Willem van der Meer 435b6f9135 Remove pending status from test 2014-10-15 14:25:06 +02:00
Dmitriy Zaporozhets 67a28cea30 Merge pull request #8048 from skv-headless/master 
same rendering for note diff as for usual diff
 2014-10-15 15:15:40 +03:00
Dmitriy Zaporozhets df9984aea8 Merge branch 'ce-upstream' into 'master' 
CE upstream

I dont fixed next files:

```
Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   lib/gitlab/ldap/access.rb
	both modified:   lib/gitlab/ldap/person.rb
	both modified:   spec/lib/gitlab/ldap/access_spec.rb
```

See merge request !197
 2014-10-15 11:54:52 +00:00
Dmitriy Zaporozhets e853ddd8a9 Merge branch 'valery_changelog' into 'master' 
Changelog: added information about sorting users

See merge request !1175
 2014-10-15 11:54:25 +00:00
Dmitriy Zaporozhets b8b0c3276a Merge branch 'notifications_documentation' into 'master' 
Notifications documentation

Fixes #1583

See merge request !1177
 2014-10-15 11:53:28 +00:00
Marin Jankovski af609805c5 Use clearer description. 2014-10-15 13:16:03 +02:00
Marin Jankovski 76cde5c0e5 Add links to the migration doc, make it clear import is only for git repos. 2014-10-15 13:13:42 +02:00