Commits · 732e6c3dbb2a249ec486ece5646eb5fbe46e8680 · iv / gitlab-ce

15 Oct, 2014 4 commits
- same rendering for note diff as for usual diff · 732e6c3d
  Evgeniy Sokovikov authored Oct 15, 2014
  
  732e6c3d
- Merge pull request #7744 from bbodenmiller/patch-14 · b3153549
  Robert Schilling authored Oct 15, 2014
```
add missing cleanup step
```
  b3153549
- Merge pull request #8041 from bbodenmiller/patch-4 · bf01c789
  Sytse Sijbrandij authored Oct 15, 2014
```
make sure tables are UTF8 capable
```
  bf01c789
- add missing cleanup step · cec3b6c3
  Ben Bodenmiller authored Oct 14, 2014
  
  cec3b6c3
14 Oct, 2014 21 commits
- make sure tables are UTF8 capable · 0901345d
  Ben Bodenmiller authored Oct 14, 2014
```
As discussed at https://github.com/gitlabhq/gitlabhq/pull/7742#issuecomment-58897445 make sure that tables have correct char set.
```
  0901345d
- Merge branch 'feature-multiple-ldap-servers' into 'master' · e3bd17a7
  Dmitriy Zaporozhets authored Oct 14, 2014
```
Feature multiple ldap servers

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

See merge request !1172
```
  e3bd17a7
- Merge branch 'libravatar_documentation' into 'master' · 4bebdc09
  Dmitriy Zaporozhets authored Oct 14, 2014
```
Libravatar documentation

Fixes #1248

See merge request !1173
```
  4bebdc09
- Merge branch 'notification_level_note' into 'master' · ef03f4a4
  Dmitriy Zaporozhets authored Oct 14, 2014
```
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
```
  ef03f4a4
- Explain new configuration options. · b4f7b387
  Jan-Willem van der Meer authored Oct 14, 2014
```
And add some advertisement to use GitLab EE
```
  b4f7b387
- Add valid LDAP server for testing · fedb223b
  Jan-Willem van der Meer authored Oct 14, 2014
  
  fedb223b
- Another link to GitHub flow. · 5d59890b
  Sytse Sijbrandij authored Oct 14, 2014
  
  5d59890b
- Use Hash syntax for LDAP server declaration · 6ce65a3e
  Jan-Willem van der Meer authored Oct 14, 2014
  
  6ce65a3e
- Add a link to libravatar doc in gitlab.yml.example. · 1d432e96
  Marin Jankovski authored Oct 14, 2014
  
  1d432e96
- Different wording for notification note. · f174800b
  Marin Jankovski authored Oct 14, 2014
  
  f174800b
- Remove unused methods · 9bf7bfda
  Jan-Willem van der Meer authored Oct 14, 2014
  
  9bf7bfda
- Add a note about notification for a project. · 920eb7ab
  Marin Jankovski authored Oct 14, 2014
  
  920eb7ab
- Add libravatar documentation. · 9abe5d36
  Marin Jankovski authored Oct 14, 2014
  
  9abe5d36
- Add explaining note to authentication method [skip ci] · ab04096c
  Jan-Willem van der Meer authored Oct 14, 2014
  
  ab04096c
- Use server specific uid · 18d2ee31
  Jan-Willem van der Meer authored Oct 14, 2014
  
  18d2ee31
- Make sure the filters are applied · d3056feb
  Jan-Willem van der Meer authored Oct 14, 2014
  
  d3056feb
- Fix authorization for LDAP login · b229b0f0
  Jan-Willem van der Meer authored Oct 14, 2014
  
  b229b0f0
- Add specs for authentication and config · 23b692c7
  Jan-Willem van der Meer authored Oct 14, 2014
  
  23b692c7
- Move dynamic omniauth declarations to initializer · fc5bfd1d
  Jan-Willem van der Meer authored Oct 14, 2014
  
  fc5bfd1d
- DRY find method to find Gitlab user · 93505f7d
  Jan-Willem van der Meer authored Oct 14, 2014
  
  93505f7d
- Remove unused method · 410d6e30
  Jan-Willem van der Meer authored Oct 14, 2014
  
  410d6e30
13 Oct, 2014 15 commits
- Merge pull request #8027 from bbodenmiller/patch-7 · 672bd390
  Robert Schilling authored Oct 13, 2014
```
update changelog
```
  672bd390
- update changelog · 01491934
  Ben Bodenmiller authored Oct 13, 2014
```
Change log entry for https://github.com/gitlabhq/gitlabhq/pull/8020
```
  01491934
- Merge pull request #7942 from cirosantilli/commit-changes-uppercase · e261de25
  Dmitriy Zaporozhets authored Oct 13, 2014
```
Make new and edit file submit more uniform
```
  e261de25
- Merge tests to support Multiple LDAP groups · 5e1c39cb
  Jan-Willem van der Meer authored Oct 13, 2014
  
  5e1c39cb
- Refactor lib files for multiple LDAP groups · 01b79123
  Jan-Willem van der Meer authored Oct 13, 2014
  
  01b79123
- Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-servers · 6c0994a3
  Jan-Willem van der Meer authored Oct 13, 2014
```
Conflicts:
	app/controllers/omniauth_callbacks_controller.rb
```
  6c0994a3
- Merge branch 'sorting-users-in-admin' into 'master' · 05fca6bf
  Dmitriy Zaporozhets authored Oct 13, 2014
```
Sorting users in admin

See merge request !1170
```
  05fca6bf
- Admin: user sorting · 4e0da232
  Valery Sizov authored Oct 10, 2014
  
  4e0da232
- Apply configuration changes for Multiple LDAP servers · e1cf9c15
  Jan-Willem van der Meer authored Oct 13, 2014
  
  e1cf9c15
- Add config changes for mutliple LDAP support (EE only) · 3cd5abf6
  Jan-Willem van der Meer authored Oct 13, 2014
  
  3cd5abf6
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · b2b71ffa
  Dmitriy Zaporozhets authored Oct 13, 2014
  
  b2b71ffa
- Merge branch 'feature-oauth-refactoring' into 'master' · 9229893c
  Dmitriy Zaporozhets authored Oct 13, 2014
```
Feature oauth refactoring

same MR as gitlab/gitlab-ee!188

See merge request !1169
```
  9229893c
- Add refactoring for multiple LDAP server support · a7e071e9
  Jan-Willem van der Meer authored Oct 13, 2014
```
These changes are ported from EE to CE. Apply changes for app directory
```
  a7e071e9
- Merge pull request #8020 from mr-vinn/note-trunc-link · a756fd1f
  Dmitriy Zaporozhets authored Oct 13, 2014
```
Improve event note display in dashboard and project activity views
```
  a756fd1f
- Merge pull request #8023 from bbodenmiller/patch-4 · 4cbf57e8
  Sytse Sijbrandij authored Oct 13, 2014
```
minor updates to mysql cleanup
```
  4cbf57e8