Commit graph

938 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 9803e0885e Project sidebar improved 2012-02-21 22:46:34 +02:00
Dmitriy Zaporozhets 1c22d4f50f Help message for wiki, styled projects page 2012-02-21 22:04:01 +02:00
Dmitriy Zaporozhets ce8eba8913 Merge branch 'wiki'
Conflicts:
	app/views/layouts/_project_menu.html.haml
2012-02-21 20:32:43 +02:00
vsizov 621bfdb4aa wiki: rspec 2012-02-21 20:18:06 +03:00
Dmitriy Zaporozhets 5c492a7089 make issue, commit row title color lighter 2012-02-20 21:50:11 +02:00
Dmitriy Zaporozhets 29c41e9a0e pollishing UI 2012-02-20 21:38:59 +02:00
Dmitriy Zaporozhets 6a445b4200 fixed forgot password form 2012-02-20 20:37:37 +02:00
Dmitriy Zaporozhets 49d58492f2 Wiki abilities 2012-02-20 21:16:55 +03:00
Dmitriy Zaporozhets 22f4c1908d Some css fixes 2012-02-20 20:04:03 +02:00
Dmitriy Zaporozhets 3a33795f2b css shadow for some components 2012-02-20 19:59:39 +02:00
vsizov bdc42488e9 wiki is done 2012-02-20 20:16:55 +03:00
Dmitriy Zaporozhets 5f4a7c3e04 Home tab added, Repository tab removed\n Ability to download branch 2012-02-20 08:38:03 +02:00
Dmitriy Zaporozhets 40ac2ebc21 fixed bug with branch/commit detection in select 2012-02-20 10:38:03 +02:00
Valery Sizov 2e1f119f22 wiki: markdown support 2012-02-19 22:19:31 +02:00
Valery Sizov d68f8401b3 wiki: improve history 2012-02-19 21:56:18 +02:00
Valery Sizov 85974948e7 Wiki: history 2012-02-19 21:52:05 +02:00
Dmitriy Zaporozhets 313d96e42b fixed mr counter for main menu 2012-02-19 21:34:59 +02:00
Dmitriy Zaporozhets 635d3e09b7 Issues, Merge Requests counters 2012-02-19 21:30:31 +02:00
Valery Sizov b565cd1972 Wiki: fixed main menu 2012-02-19 21:16:29 +02:00
Valery Sizov 40ce6c9131 Wiki: remove notice line 2012-02-19 19:55:37 +02:00
Valery Sizov 12ea84fe46 fix shema after rebase 2012-02-19 19:54:00 +02:00
Valery Sizov 57271da612 Wiki: design fixed 2012-02-19 19:50:13 +02:00
Valery Sizov 4c1b8558df Wiki: base implemetation logic 2012-02-19 19:50:13 +02:00
Valery Sizov eacea15a21 wiki base sceleton 2012-02-19 19:50:13 +02:00
Dmitriy Zaporozhets df27ec29f3 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2012-02-19 16:31:17 +02:00
Dmitriy Zaporozhets 2e83de1924 fixed layout for ipad 2012-02-19 16:31:11 +02:00
Valeriy Sizov a44b85be9e Merge pull request #422 from steveprentice/master
This makes gitlabhq compatible with more LDAP servers (specifically OpenLDAP).
2012-02-19 03:45:55 -08:00
Dmitriy Zaporozhets ee45a49c57 preparing to v2.2 2012-02-19 12:36:16 +02:00
Dmitriy Zaporozhets a6870dd08f fix travis after config rename 2012-02-19 11:49:48 +02:00
Dmitriy Zaporozhets 9edbac5ac8 Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples
Conflicts:
	.gitignore
2012-02-19 11:39:28 +02:00
Dmitriy Zaporozhets a84a929428 Merge pull request #426 from RLovelett/resque-update
Fixes :public Warning In Resque When Running Any Rails Command
2012-02-19 01:34:58 -08:00
Ryan Lovelett 4748ae8c8c Fixes the issue with Resque where it was complaining about :public no longer being used. 2012-02-18 09:37:58 -06:00
Dmitriy Zaporozhets 3f91da6816 Fixed widget counts, improved styles 2012-02-18 15:59:01 +02:00
Dmitriy Zaporozhets fa7bd43ab9 How to merge instructions 2012-02-18 14:43:35 +02:00
Dmitriy Zaporozhets 94db8a1c33 Usability & design improvements 2012-02-18 14:12:48 +02:00
Steve Prentice 2bb2dee057 Use the omniauth-ldap info object instead of the raw ldap info in extra.
This helps with compatibility with more LDAP providers as the implementation
doesn't depend on the exact names of the LDAP fields. The LDAP strategy
helps maps the attributes to the fields in the info object and we use the
info object to get the email and name.

This makes the LDAP auth compatible with most OpenLDAP servers as well.
2012-02-17 09:10:50 -08:00
Dmitriy Zaporozhets 9a24ccdea1 Fixed mistype in permissions, Fixed migration 2012-02-16 09:04:56 +02:00
Dmitriy Zaporozhets 9dfbcc6ef3 Fixed permission migration 2012-02-16 09:04:55 +02:00
Dmitriy Zaporozhets 1c62ec09b0 4 roles permission system 2012-02-16 09:03:55 +02:00
Dmitriy Zaporozhets dac7c44ab3 Updated readme, Roles in progress 2012-02-15 23:51:04 +02:00
Dmitriy Zaporozhets 37224dc9c1 ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only 2012-02-15 22:02:33 +02:00
Dmitriy Zaporozhets 3a9e5a9357 Show current commit id in branch/tag select 2012-02-15 08:46:09 +02:00
Dmitriy Zaporozhets 98f040a56f Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2012-02-15 01:15:08 +02:00
Dmitriy Zaporozhets 8d493019c4 Show commits for merge request immediatly 2012-02-15 01:15:02 +02:00
Valery Sizov c5a9e3cb1b Bug#326: Always empty repositories if trailing slash is missed in base_path 2012-02-15 00:43:13 +02:00
Dmitriy Zaporozhets ef396d08fc Fixed encoding issue for diff. Reordered merge request commits 2012-02-15 00:41:51 +02:00
Valery Sizov 65e4ad3147 fixed design new issue form 2012-02-15 00:33:54 +02:00
Dmitriy Zaporozhets 3230577ce0 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2012-02-15 00:21:07 +02:00
Dmitriy Zaporozhets 4aa2b34e79 Commit show should display author & commiter info 2012-02-15 00:21:00 +02:00
Valery Sizov 7b3b140004 fixed design login form 2012-02-15 00:15:15 +02:00