OSDN Git Service
Dmitriy Zaporozhets [Sun, 26 Feb 2012 22:41:53 +0000 (00:41 +0200)]
finished scss refactoring
Dmitriy Zaporozhets [Sun, 26 Feb 2012 22:21:53 +0000 (00:21 +0200)]
Moving ui styles to one scss file, Added ui class to body
Dmitriy Zaporozhets [Sun, 26 Feb 2012 20:06:40 +0000 (22:06 +0200)]
removed unnecessary hr tags & titles
Dmitriy Zaporozhets [Sun, 26 Feb 2012 19:39:13 +0000 (21:39 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sun, 26 Feb 2012 19:38:45 +0000 (21:38 +0200)]
Fixed ajax loading image. Fixed wrong wording
Dmitriy Zaporozhets [Sat, 25 Feb 2012 21:12:49 +0000 (13:12 -0800)]
Merge pull request #468 from bencevans/patch-1
Title for a link fixed
Dmitriy Zaporozhets [Sat, 25 Feb 2012 21:12:27 +0000 (13:12 -0800)]
Merge pull request #470 from bgondy/patch-1
Fixed Typo problem
bgondy [Sat, 25 Feb 2012 15:41:58 +0000 (16:41 +0100)]
Update app/views/projects/team.html.haml
Ben Evans [Sat, 25 Feb 2012 11:03:44 +0000 (11:03 +0000)]
Title for a link fixed
Dmitriy Zaporozhets [Fri, 24 Feb 2012 20:48:27 +0000 (22:48 +0200)]
Increased count of notes loaded when visit wall page
Dmitriy Zaporozhets [Fri, 24 Feb 2012 20:39:51 +0000 (22:39 +0200)]
Merge branch 'notes_refactoring'
Dmitriy Zaporozhets [Fri, 24 Feb 2012 20:36:44 +0000 (22:36 +0200)]
Fixed comments for snippets. Tests fixed
Dmitriy Zaporozhets [Fri, 24 Feb 2012 20:19:47 +0000 (22:19 +0200)]
Reply button, Comments for Merge Request diff
Dmitriy Zaporozhets [Fri, 24 Feb 2012 15:41:14 +0000 (07:41 -0800)]
Merge pull request #466 from skroutz/no-rbenv
Don't enforce rbenv version
Dmitriy Zaporozhets [Fri, 24 Feb 2012 15:40:38 +0000 (07:40 -0800)]
Merge pull request #465 from skroutz/branches_commit_link
Fix broken commit link in branches page
Christos Trochalakis [Fri, 24 Feb 2012 15:34:00 +0000 (17:34 +0200)]
Don't enforce rbenv version
It would be better not include either rbenv or a specific rbenv version
with gitlab.
Christos Trochalakis [Fri, 24 Feb 2012 15:27:44 +0000 (17:27 +0200)]
Fix broken commit link in branches page
Dmitriy Zaporozhets [Fri, 24 Feb 2012 07:16:06 +0000 (09:16 +0200)]
move notes login to one controller
Dmitriy Zaporozhets [Thu, 23 Feb 2012 19:04:20 +0000 (21:04 +0200)]
Status codes for errors, New error pages
Dmitriy Zaporozhets [Wed, 22 Feb 2012 05:14:54 +0000 (07:14 +0200)]
better error handling for not found resource, gitolite error
Dmitriy Zaporozhets [Wed, 22 Feb 2012 15:14:54 +0000 (07:14 -0800)]
Merge pull request #443 from CedricGatay/fix/incorrectLineNumberingInDiff
Incorrect line numbering in diff
Cedric Gatay [Wed, 22 Feb 2012 15:04:41 +0000 (16:04 +0100)]
Incorrect line numbering in diff
When displaying a diff, the line number always starts at one, even if the first diff is not at the first line
Fixes this to display correct line numbering on first diff
Dmitriy Zaporozhets [Tue, 21 Feb 2012 22:31:18 +0000 (00:31 +0200)]
Abilities extended. Resources security improved
Dmitriy Zaporozhets [Tue, 21 Feb 2012 21:09:46 +0000 (23:09 +0200)]
btn padded class
Dmitriy Zaporozhets [Tue, 21 Feb 2012 20:51:18 +0000 (22:51 +0200)]
separated buttons for sidebar
Dmitriy Zaporozhets [Tue, 21 Feb 2012 20:46:34 +0000 (22:46 +0200)]
Project sidebar improved
Dmitriy Zaporozhets [Tue, 21 Feb 2012 20:04:01 +0000 (22:04 +0200)]
Help message for wiki, styled projects page
Dmitriy Zaporozhets [Tue, 21 Feb 2012 18:32:43 +0000 (20:32 +0200)]
Merge branch 'wiki'
Conflicts:
app/views/layouts/_project_menu.html.haml
vsizov [Tue, 21 Feb 2012 17:18:06 +0000 (20:18 +0300)]
wiki: rspec
Dmitriy Zaporozhets [Mon, 20 Feb 2012 19:50:11 +0000 (21:50 +0200)]
make issue, commit row title color lighter
Dmitriy Zaporozhets [Mon, 20 Feb 2012 19:38:59 +0000 (21:38 +0200)]
pollishing UI
Dmitriy Zaporozhets [Mon, 20 Feb 2012 18:37:37 +0000 (20:37 +0200)]
fixed forgot password form
Dmitriy Zaporozhets [Mon, 20 Feb 2012 18:16:55 +0000 (21:16 +0300)]
Wiki abilities
Dmitriy Zaporozhets [Mon, 20 Feb 2012 18:04:03 +0000 (20:04 +0200)]
Some css fixes
Dmitriy Zaporozhets [Mon, 20 Feb 2012 17:59:39 +0000 (19:59 +0200)]
css shadow for some components
vsizov [Mon, 20 Feb 2012 17:16:55 +0000 (20:16 +0300)]
wiki is done
Dmitriy Zaporozhets [Mon, 20 Feb 2012 06:39:03 +0000 (08:39 +0200)]
Home tab added, Repository tab removed\n Ability to download branch
Dmitriy Zaporozhets [Mon, 20 Feb 2012 08:38:03 +0000 (10:38 +0200)]
fixed bug with branch/commit detection in select
Valery Sizov [Sun, 19 Feb 2012 20:19:31 +0000 (22:19 +0200)]
wiki: markdown support
Valery Sizov [Sun, 19 Feb 2012 19:56:18 +0000 (21:56 +0200)]
wiki: improve history
Valery Sizov [Sun, 19 Feb 2012 19:52:05 +0000 (21:52 +0200)]
Wiki: history
Dmitriy Zaporozhets [Sun, 19 Feb 2012 19:34:59 +0000 (21:34 +0200)]
fixed mr counter for main menu
Dmitriy Zaporozhets [Sun, 19 Feb 2012 19:30:31 +0000 (21:30 +0200)]
Issues, Merge Requests counters
Valery Sizov [Sun, 19 Feb 2012 19:16:29 +0000 (21:16 +0200)]
Wiki: fixed main menu
Valery Sizov [Sun, 19 Feb 2012 17:55:37 +0000 (19:55 +0200)]
Wiki: remove notice line
Valery Sizov [Sun, 19 Feb 2012 17:54:00 +0000 (19:54 +0200)]
fix shema after rebase
Valery Sizov [Sun, 19 Feb 2012 17:47:49 +0000 (19:47 +0200)]
Wiki: design fixed
Valery Sizov [Sun, 19 Feb 2012 17:05:35 +0000 (19:05 +0200)]
Wiki: base implemetation logic
Valery Sizov [Sun, 19 Feb 2012 14:35:31 +0000 (16:35 +0200)]
wiki base sceleton
Dmitriy Zaporozhets [Sun, 19 Feb 2012 14:31:17 +0000 (16:31 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Sun, 19 Feb 2012 14:31:11 +0000 (16:31 +0200)]
fixed layout for ipad
Valeriy Sizov [Sun, 19 Feb 2012 11:45:55 +0000 (03:45 -0800)]
Merge pull request #422 from steveprentice/master
This makes gitlabhq compatible with more LDAP servers (specifically OpenLDAP).
Dmitriy Zaporozhets [Sun, 19 Feb 2012 10:36:16 +0000 (12:36 +0200)]
preparing to v2.2
Dmitriy Zaporozhets [Sun, 19 Feb 2012 09:49:48 +0000 (11:49 +0200)]
fix travis after config rename
Dmitriy Zaporozhets [Sun, 19 Feb 2012 09:39:28 +0000 (11:39 +0200)]
Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples
Conflicts:
.gitignore
Dmitriy Zaporozhets [Sun, 19 Feb 2012 09:34:58 +0000 (01:34 -0800)]
Merge pull request #426 from RLovelett/resque-update
Fixes :public Warning In Resque When Running Any Rails Command
Ryan Lovelett [Sat, 18 Feb 2012 15:37:58 +0000 (09:37 -0600)]
Fixes the issue with Resque where it was complaining about :public no longer being used.
Dmitriy Zaporozhets [Sat, 18 Feb 2012 13:59:01 +0000 (15:59 +0200)]
Fixed widget counts, improved styles
Dmitriy Zaporozhets [Sat, 18 Feb 2012 12:43:35 +0000 (14:43 +0200)]
How to merge instructions
Dmitriy Zaporozhets [Sat, 18 Feb 2012 12:12:48 +0000 (14:12 +0200)]
Usability & design improvements
Steve Prentice [Fri, 17 Feb 2012 17:10:50 +0000 (09:10 -0800)]
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.
Dmitriy Zaporozhets [Thu, 16 Feb 2012 07:04:56 +0000 (09:04 +0200)]
Fixed mistype in permissions, Fixed migration
Dmitriy Zaporozhets [Thu, 16 Feb 2012 07:04:55 +0000 (09:04 +0200)]
Fixed permission migration
Dmitriy Zaporozhets [Thu, 16 Feb 2012 07:03:55 +0000 (09:03 +0200)]
4 roles permission system
Dmitriy Zaporozhets [Wed, 15 Feb 2012 21:51:04 +0000 (23:51 +0200)]
Updated readme, Roles in progress
Dmitriy Zaporozhets [Wed, 15 Feb 2012 20:02:33 +0000 (22:02 +0200)]
ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only
Dmitriy Zaporozhets [Wed, 15 Feb 2012 06:46:09 +0000 (08:46 +0200)]
Show current commit id in branch/tag select
Dmitriy Zaporozhets [Tue, 14 Feb 2012 23:15:08 +0000 (01:15 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 14 Feb 2012 23:15:02 +0000 (01:15 +0200)]
Show commits for merge request immediatly
Valery Sizov [Tue, 14 Feb 2012 22:42:46 +0000 (00:42 +0200)]
Bug#326: Always empty repositories if trailing slash is missed in base_path
Dmitriy Zaporozhets [Tue, 14 Feb 2012 22:41:36 +0000 (00:41 +0200)]
Fixed encoding issue for diff. Reordered merge request commits
Valery Sizov [Tue, 14 Feb 2012 22:33:26 +0000 (00:33 +0200)]
fixed design new issue form
Dmitriy Zaporozhets [Tue, 14 Feb 2012 22:21:07 +0000 (00:21 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 14 Feb 2012 22:21:00 +0000 (00:21 +0200)]
Commit show should display author & commiter info
Valery Sizov [Tue, 14 Feb 2012 22:15:15 +0000 (00:15 +0200)]
fixed design login form
Dmitriy Zaporozhets [Tue, 14 Feb 2012 22:10:01 +0000 (00:10 +0200)]
better commits list style
Dmitriy Zaporozhets [Tue, 14 Feb 2012 21:53:41 +0000 (23:53 +0200)]
Ignore invalid submodule entries
Dmitriy Zaporozhets [Tue, 14 Feb 2012 21:49:19 +0000 (23:49 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 14 Feb 2012 21:48:42 +0000 (23:48 +0200)]
submodules displayed for tree view
Dmitriy Zaporozhets [Tue, 14 Feb 2012 20:52:28 +0000 (12:52 -0800)]
Merge pull request #406 from pdfr/syntax
Add syntax highlighting for D and Haskell
Pedro Rodrigues [Tue, 14 Feb 2012 20:46:56 +0000 (20:46 +0000)]
Add syntax highlighting for D and Haskell
Dmitriy Zaporozhets [Tue, 14 Feb 2012 18:00:25 +0000 (20:00 +0200)]
Fixed commit diff: content of removed files displayed
Dmitriy Zaporozhets [Mon, 13 Feb 2012 22:20:23 +0000 (00:20 +0200)]
per line comments improved. replaced from dbclick to link
Dmitriy Zaporozhets [Mon, 13 Feb 2012 19:33:18 +0000 (21:33 +0200)]
Merge branch 'features/pry'
Dmitriy Zaporozhets [Mon, 13 Feb 2012 18:42:19 +0000 (20:42 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
root [Sun, 12 Feb 2012 23:49:38 +0000 (17:49 -0600)]
Fixed a typo by the third n in 'commit'.
Dmitriy Zaporozhets [Mon, 13 Feb 2012 18:40:39 +0000 (20:40 +0200)]
enable markdown for email notification
Saito [Mon, 13 Feb 2012 08:39:35 +0000 (16:39 +0800)]
add vagrant file to ignore list
Ariejan de Vroom [Mon, 13 Feb 2012 07:31:05 +0000 (23:31 -0800)]
Merge pull request #399 from JoshuaRogers/corrected_typo
Fixed a typo by the third n in 'commit'.
Saito [Mon, 13 Feb 2012 05:43:58 +0000 (13:43 +0800)]
switch ruby-debug to pry
root [Sun, 12 Feb 2012 23:49:38 +0000 (17:49 -0600)]
Fixed a typo by the third n in 'commit'.
Dmitriy Zaporozhets [Sun, 12 Feb 2012 22:12:18 +0000 (00:12 +0200)]
Commits page styled better now
Dmitriy Zaporozhets [Sun, 12 Feb 2012 21:52:27 +0000 (23:52 +0200)]
fixed unworking infinite scroll
Dmitriy Zaporozhets [Sun, 12 Feb 2012 17:47:37 +0000 (19:47 +0200)]
fixed flash message. better tree css
Dmitriy Zaporozhets [Sun, 12 Feb 2012 15:48:17 +0000 (17:48 +0200)]
fixed layout for ipad. changed main width
Dmitriy Zaporozhets [Sun, 12 Feb 2012 15:34:52 +0000 (17:34 +0200)]
fixed main menu for firefox & opera
Dmitriy Zaporozhets [Sun, 12 Feb 2012 11:15:41 +0000 (13:15 +0200)]
styled top panel
Dmitriy Zaporozhets [Sun, 12 Feb 2012 00:38:38 +0000 (02:38 +0200)]
restyled main menu. move from left to top orientation
Dmitriy Zaporozhets [Sat, 11 Feb 2012 22:29:16 +0000 (00:29 +0200)]
improved diff, restyled login page
Dmitriy Zaporozhets [Sat, 11 Feb 2012 21:22:33 +0000 (23:22 +0200)]
Lists restyled, blue link colors added