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,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan-Willem van der Meer 61d9d4e2eb Default the LDAP server label to LDAP 2014-10-17 18:08:26 +02:00
Jan-Willem van der Meer d1c3864778 Prevent redeclaration of LDAP strategy 2014-10-17 18:03:34 +02:00
Dmitriy Zaporozhets bd9d9b6def Merge branch '7-4-stable' into 'master' 
7-4-stable to master

See merge request !1191
 2014-10-17 15:06:25 +00:00
Sytse Sijbrandij 6cff68fb30 Link to trending public projects so more relevant projects are shown to new users. 2014-10-17 16:27:44 +02:00
Dmitriy Zaporozhets 564c4138e9 Merge branch 'master' into '7-4-stable' 
Merge master into 7-4-stable

See merge request !1189
 2014-10-17 13:57:28 +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
Dmitriy Zaporozhets f8cdd62e22 Fix account existing blocking 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 14:08:02 +03:00
Valery Sizov 4da88dbb2d documents updated 2014-10-17 13:47:20 +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
Vinnie Okada cd3eabd712 Use GET instead of POST for Markdown previews 2014-10-16 22:45:13 -05:00
Ben Bodenmiller 077fc683fa simplify DHE parameter generation 2014-10-16 14:34:03 -07: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 32d0bf3afd Fix snippets seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-16 16:50:09 +03:00
Valery Sizov 2e485af7b0 bump gitlab-shelle 2014-10-16 12:16:18 +00: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 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
Ben Bodenmiller 5d7e1b6ae2 match latest config from https://cipherli.st/ 2014-10-15 23:51:53 -07:00
Vinnie Okada 786045ab81 Fix Rspec error when using non-default port 
Prevent test failures when GitLab is configured to use a port other than
80.
 2014-10-16 00:03:10 -05:00
Vinnie Okada 5700842ba8 Add Markdown preview to more forms 
Enable Markdown previews when creating and editing issues, merge
requests, and milestones, and when editing notes.
 2014-10-15 23:52:33 -05:00
Ciro Santilli 39c66c822e Use Gitlab.config instead of Settings everywhere 2014-10-15 23:01:31 +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
Valery Sizov b5763e91cd add gitlab-shell identification 2014-10-15 20:03:25 +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 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
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
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 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
Marin Jankovski 2803d9e025 Git is a distributed vcs. 2014-10-15 13:08:55 +02:00
Marin Jankovski adb64dc2ee Clearer what to contribute. 2014-10-15 13:08:55 +02:00
Marin Jankovski fb05fa859e Add a doc on how to migrate from SVN to gitlab. 2014-10-15 13:08:55 +02:00
Marin Jankovski 57b38f6f1c Describe who can trigger builds and where, add no red tests policy to contributing doc. 2014-10-15 12:48:37 +02:00
Dmitriy Zaporozhets 19b0ba5ecb Merge branch 'fix-star-icon' into 'master' 
Fix star icon

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/682.

See merge request !1180
 2014-10-15 09:36:19 +00:00
Dmitriy Zaporozhets c31d9b73d7 Merge branch 'improve-mr-widgets' into 'master' 
Improve MR widgets

Before:

![Screenshot 2014-10-14 17.49.03](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/0283aa379e/Screenshot_2014-10-14_17.49.03.png)

After:

![Screenshot 2014-10-14 17.48.58](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/ca9f2bae19/Screenshot_2014-10-14_17.48.58.png)

See merge request !1178
 2014-10-15 09:32:52 +00:00
Dmitriy Zaporozhets ab1e131afa Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-15 12:15:51 +03:00
Dmitriy Zaporozhets 4e925d801b Merge branch 'issue-ldap-initialization' into 'master' 
Issue ldap initialization

If LDAP is disabled error will appear:

```
ERROR -- : Missing setting 'servers' in 'ldap' section in /Volumes/Work/gitlab/development/community/gitlab/config/gitlab.yml (Settingslogic::MissingSetting)
```

@marin Can you test if this will solve the startup problem?

See merge request !1179
 2014-10-15 09:13:52 +00:00
Evgeniy Sokovikov 732e6c3dbb same rendering for note diff as for usual diff 2014-10-15 13:03:27 +04:00
Robert Schilling b31535494e Merge pull request #7744 from bbodenmiller/patch-14 
add missing cleanup step
 2014-10-15 10:22:37 +02:00