home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,197 Commits 48 Branches 340 Tags
732e6c3dbb2a249ec486ece5646eb5fbe46e8680
Commit Graph
12197 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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
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
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
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
Dmitriy Zaporozhets 9229893c8a Merge branch 'feature-oauth-refactoring' into 'master' 
Feature oauth refactoring

same MR as gitlab/gitlab-ee!188

See merge request !1169
 2014-10-13 11:46:45 +00:00
Jan-Willem van der Meer a7e071e982 Add refactoring for multiple LDAP server support 
These changes are ported from EE to CE. Apply changes for app directory
 2014-10-13 13:39:54 +02:00
Dmitriy ZaporozhetsandJan-Willem van der Meer a756fd1ff6 Merge pull request #8020 from mr-vinn/note-trunc-link 
Improve event note display in dashboard and project activity views
 2014-10-13 13:01:57 +02:00
Sytse Sijbrandij 4cbf57e800 Merge pull request #8023 from bbodenmiller/patch-4 
minor updates to mysql cleanup
 2014-10-13 11:34:06 +02:00
Dmitriy Zaporozhets 4731d77bb2 Merge pull request #8020 from mr-vinn/note-trunc-link 
Improve event note display in dashboard and project activity views
 2014-10-13 11:40:50 +03:00
Ben Bodenmiller b0e92ca9ae minor updates to mysql cleanup 
* take -> make
* correct incorrect details about when pool size was changed
 2014-10-13 00:52:08 -07:00
Robert Schilling fe14384e27 Merge pull request #8021 from bbodenmiller/schema.rb 
simplify schema.rb reset in upgrade guides
 2014-10-13 08:22:19 +02:00
Sytse Sijbrandij f7b19023b1 Merge pull request #7742 from bbodenmiller/patch-7 
Cleanup MySQL database
 2014-10-13 08:19:48 +02:00
Vinnie Okada b3c70d001d Improve dashboard note view and add tests 
Update the `#first_line_in_markdown` method so that the first line of
parsed text is displayed more reliably, and the continuation indicators
("...") are displayed in all cases where the note is truncated.

Also add Rspec tests for `EventsHelper#event_note`.
 2014-10-12 23:56:56 -05:00
Ben Bodenmiller 2b3090d91b simplify schema.rb reset in upgrade guides 2014-10-12 14:39:41 -07:00
Ben Bodenmiller d94be1ddbf Cleanup MySQL database 
Addresses changes made to installation guide and config files but never
applied in update process. Relevant changes to installation guide and
config files were made in
gitlabhq@cbb5b00,
gitlabhq@498a4e6,
gitlabhq@c33d5e1,
gitlabhq@485162e#diff-e1059d0fa0437ffad94facff86210603,
gitlabhq@72e2fe2#diff-d1b4ff7de834bae6008dd49550413a6f,
gitlabhq@5163a8f#diff-e1059d0fa0437ffad94facff86210603,
gitlabhq@993af5d#diff-e1059d0fa0437ffad94facff86210603,
&
gitlabhq@d3f5a0c.
 2014-10-12 14:29:42 -07:00
Dmitriy Zaporozhets b956605f9e Merge branch 'ambiguous-sha' into 'master' 
Fix ambiguous sha problem with mentioned commit

Before: write in database only 6 chars of commit sha. This cause to `Ambiguous SHA1 prefix` exception.

- [x] write full commit sha in db.
- [x] Standardise usage of sha truncation: 8 characters everywhere.
- [x] prevent exception when ambiguous sha requested in markdown

Fixes #1644

See merge request !1171
 2014-10-12 20:28:21 +00:00
Vinnie Okada 5b2a42a091 Preserve link href in truncated note view 
Notes on the dashboard views are truncated to 150 characters; this
change ensures that when a link's text is truncated it still points to
the correct URL.
 2014-10-12 14:52:17 -05:00
Dmitriy Zaporozhets 66dd61ef0f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-12 21:51:15 +03:00