home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +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 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 ace045499a fix permission issue in upgrade guides 2014-10-14 22:54:30 -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
Kevin Houdebert 62b322d7b5 Add Hipchat services API 2014-10-14 19:07:34 +02: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
Jan-Willem van der Meer 18d2ee31e8 Use server specific uid 2014-10-14 10:54:43 +02:00
Jan-Willem van der Meer d3056feb11 Make sure the filters are applied 2014-10-14 10:08:47 +02:00
Jan-Willem van der Meer b229b0f003 Fix authorization for LDAP login 2014-10-14 09:40:35 +02:00
Jan-Willem van der Meer 23b692c701 Add specs for authentication and config 2014-10-14 09:31:38 +02:00
Jan-Willem van der Meer fc5bfd1dc1 Move dynamic omniauth declarations to initializer 2014-10-14 09:31:06 +02:00
Jan-Willem van der Meer 93505f7d04 DRY find method to find Gitlab user 2014-10-14 09:05:29 +02:00
Jan-Willem van der Meer 410d6e306b Remove unused method 2014-10-14 08:54:15 +02:00
Patricio Cano 3d705131f7 Added a password strength indicator 
to the profile page and the sign_up page, added CSS to best display it and created the custom script to load the meter.
 2014-10-13 22:05:21 -05:00
Ciro Santilli 4d0d5e79ba Factor authorize_push! and authorize_code_access! 
with existing method_missing. Pattern already used extensively,
so let's be consistent and use it everywhere.
 2014-10-13 21:31:49 +02:00
Ciro Santilli a22d4cebb0 Remove unused filter from ProjectsController 
Neither controller nor any of it's descendants have those actions.
 2014-10-13 21:24:42 +02:00
Ciro Santilli c278520f9b Remove unused dev_tools helper. 2014-10-13 21:21:58 +02:00
Ciro Santilli 2d23522107 Use :message key, not :error for File::Service. 2014-10-13 20:55:09 +02:00
Ciro Santilli d584c406e8 Move new blob commit message textarea below editor 
- match edit blob view
- you enter the commit message *after* you make the modifications
 2014-10-13 20:54:33 +02:00
Robert Schilling 672bd3902d Merge pull request #8027 from bbodenmiller/patch-7 
update changelog
 2014-10-13 18:30:18 +02:00
Ben Bodenmiller 014919340a update changelog 
Change log entry for https://github.com/gitlabhq/gitlabhq/pull/8020
 2014-10-13 09:07:23 -07:00
Dmitriy Zaporozhets e261de255d Merge pull request #7942 from cirosantilli/commit-changes-uppercase 
Make new and edit file submit more uniform
 2014-10-13 18:47:46 +03:00
Jan-Willem van der Meer 5e1c39cb78 Merge tests to support Multiple LDAP groups 2014-10-13 17:33:44 +02:00
Jan-Willem van der Meer 01b791237c Refactor lib files for multiple LDAP groups 2014-10-13 17:24:05 +02:00
Jan-Willem van der Meer 6c0994a3b3 Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-servers 
Conflicts:
	app/controllers/omniauth_callbacks_controller.rb
 2014-10-13 17:07:53 +02:00
HerrBerg fc6a291af3 fix exclude wiki regex 
the new regex allows importing repositories with repository name ending with wiki but still exclude gitlab wiki repositories
 2014-10-13 16:26:35 +02:00
Dmitriy Zaporozhets 05fca6bfc2 Merge branch 'sorting-users-in-admin' into 'master' 
Sorting users in admin

See merge request !1170
 2014-10-13 13:59:17 +00:00
Valery Sizov 4e0da2325b Admin: user sorting 2014-10-13 16:07:57 +03:00
Jan-Willem van der Meer e1cf9c15eb Apply configuration changes for Multiple LDAP servers 2014-10-13 14:04:10 +02:00
Jan-Willem van der Meer 3cd5abf635 Add config changes for mutliple LDAP support (EE only) 2014-10-13 13:56:54 +02:00
Dmitriy Zaporozhets b2b71ffadc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-13 14:47:06 +03:00