Commit graph

873 commits

Author SHA1 Message Date
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
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
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
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
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
Dmitriy Zaporozhets
b84b485bbe better commits list style 2012-02-15 00:10:01 +02:00
Dmitriy Zaporozhets
ccfeddec46 Ignore invalid submodule entries 2012-02-14 23:53:41 +02:00
Dmitriy Zaporozhets
5ac434a60e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-02-14 23:49:19 +02:00
Dmitriy Zaporozhets
a7bcc2eb5c submodules displayed for tree view 2012-02-14 23:48:42 +02:00
Dmitriy Zaporozhets
15e18c2e5e Merge pull request #406 from pdfr/syntax
Add syntax highlighting for D and Haskell
2012-02-14 12:52:28 -08:00
Pedro Rodrigues
a9fc97db46 Add syntax highlighting for D and Haskell 2012-02-14 20:46:56 +00:00
Dmitriy Zaporozhets
c062e56b4c Fixed commit diff: content of removed files displayed 2012-02-14 20:00:25 +02:00
Dmitriy Zaporozhets
ae416a76ff per line comments improved. replaced from dbclick to link 2012-02-14 00:20:23 +02:00
Dmitriy Zaporozhets
6473977a2f Merge branch 'features/pry' 2012-02-13 21:33:18 +02:00
Dmitriy Zaporozhets
0d393d88eb Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-02-13 20:42:19 +02:00
root
3f4eb731df Fixed a typo by the third n in 'commit'. 2012-02-13 20:41:16 +02:00
Dmitriy Zaporozhets
41d439401d enable markdown for email notification 2012-02-13 20:40:39 +02:00
Saito
8569317367 add vagrant file to ignore list 2012-02-13 16:39:35 +08:00
Ariejan de Vroom
5f1d76bf8a Merge pull request #399 from JoshuaRogers/corrected_typo
Fixed a typo by the third n in 'commit'.
2012-02-12 23:31:05 -08:00
Saito
5b40a17333 switch ruby-debug to pry 2012-02-13 13:43:58 +08:00