home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,229 Commits 48 Branches 340 Tags
fad588f2bee102bf4ab090874d041e227d4e2ee4
Commit Graph
12229 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 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
Jan-Willem van der Meer dcf6c26075 Only enable LDAP providers if LDAP is enabled 2014-10-15 09:53:16 +02:00
Sytse Sijbrandij bf01c789c7 Merge pull request #8041 from bbodenmiller/patch-4 
make sure tables are UTF8 capable
 2014-10-15 09:18:49 +02:00
Ben Bodenmiller cec3b6c355 add missing cleanup step 2014-10-14 23:53:01 -07:00
Ben Bodenmiller 0901345d1b make sure tables are UTF8 capable 
As discussed at https://github.com/gitlabhq/gitlabhq/pull/7742#issuecomment-58897445 make sure that tables have correct char set.
 2014-10-14 15:45:44 -07:00
Dmitriy Zaporozhets e3bd17a7ba Merge branch 'feature-multiple-ldap-servers' into 'master' 
Feature multiple ldap servers

Update the code so Gitlab-EE can support multiple LDAP servers

See merge request !1172
 2014-10-14 15:01:37 +00:00
Dmitriy Zaporozhets 0d30b13a7a Move "modify merge message link" to the right to prevent accidently hiting accept button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-14 17:48:32 +03:00
Dmitriy Zaporozhets 706ee232c5 Make accept MR widget looks similar to panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-14 17:47:31 +03:00
Marin Jankovski 8e7da6455b Fix spelling mistakes in notifications document. 2014-10-14 16:12:22 +02:00
Marin Jankovski 30b803fa3f Add notifications documentation. 2014-10-14 16:01:45 +02:00
Dmitriy Zaporozhets 3c66490e6f Use stars icon on explore->starred page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-14 16:46:50 +03:00
Dmitriy Zaporozhets 4bebdc0946 Merge branch 'libravatar_documentation' into 'master' 
Libravatar documentation

Fixes #1248

See merge request !1173
 2014-10-14 13:27:56 +00:00
Dmitriy Zaporozhets ef03f4a429 Merge branch 'notification_level_note' into 'master' 
Notification level note

Fixes #1406

![Screenshot 2014-10-14 12.28.40](https://dev.gitlab.org/uploads/gitlab/gitlabhq/e2aef0a8d6/Screenshot_2014-10-14_12.28.40.png)

See merge request !1174
 2014-10-14 13:24:10 +00:00
Jan-Willem van der Meer b4f7b387d0 Explain new configuration options. 
And add some advertisement to use GitLab EE
 2014-10-14 15:03:53 +02:00
Valery Sizov 6774d5f6ea Add more stuff to changelog 2014-10-14 16:00:40 +03:00
Jan-Willem van der Meer fedb223b09 Add valid LDAP server for testing 2014-10-14 13:52:15 +02:00
Sytse Sijbrandij 5d59890b9d Another link to GitHub flow. 2014-10-14 13:21:42 +02:00
Jan-Willem van der Meer 6ce65a3e95 Use Hash syntax for LDAP server declaration 2014-10-14 13:13:59 +02:00
Marin Jankovski 1d432e96bc Add a link to libravatar doc in gitlab.yml.example. 2014-10-14 12:31:47 +02:00
Marin Jankovski f174800b20 Different wording for notification note. 2014-10-14 12:28:30 +02:00
Jan-Willem van der Meer 9bf7bfda20 Remove unused methods 2014-10-14 12:09:24 +02:00
Marin Jankovski 920eb7abc4 Add a note about notification for a project. 2014-10-14 12:02:05 +02:00
Marin Jankovski 9abe5d36d7 Add libravatar documentation. 2014-10-14 11:23:33 +02:00
Jan-Willem van der Meer ab04096c6c Add explaining note to authentication method [skip ci] 2014-10-14 11:16:47 +02:00