OSDN Git Service
Dmitriy Zaporozhets [Mon, 12 Mar 2012 06:59:18 +0000 (23:59 -0700)]
Merge pull request #538 from zvirusz/patch-1
fix typo
Andrey Janzen [Mon, 12 Mar 2012 02:02:05 +0000 (09:02 +0700)]
fix typo
Valery Sizov [Sun, 11 Mar 2012 15:49:09 +0000 (17:49 +0200)]
unicorn: fix path to pid file
Dmitriy Zaporozhets [Sun, 11 Mar 2012 09:46:15 +0000 (11:46 +0200)]
projects page improved
Dmitriy Zaporozhets [Sun, 11 Mar 2012 08:47:30 +0000 (10:47 +0200)]
fix update_hooks task
Dmitriy Zaporozhets [Sat, 10 Mar 2012 21:57:53 +0000 (23:57 +0200)]
fixed snippet show
Dmitriy Zaporozhets [Sat, 10 Mar 2012 21:41:05 +0000 (23:41 +0200)]
Usability improved. Nothing to show messages for issues, MR
Dmitriy Zaporozhets [Sat, 10 Mar 2012 20:59:01 +0000 (22:59 +0200)]
fix text color for account popup hover
Valery Sizov [Sat, 10 Mar 2012 15:48:29 +0000 (17:48 +0200)]
added unicorn gemfile
Valery Sizov [Sat, 10 Mar 2012 14:57:43 +0000 (16:57 +0200)]
added example config for unicorn
Dmitriy Zaporozhets [Sat, 10 Mar 2012 09:32:43 +0000 (11:32 +0200)]
fixed line height for top panel
Dmitriy Zaporozhets [Fri, 9 Mar 2012 22:47:59 +0000 (00:47 +0200)]
main menu css updated
Dmitriy Zaporozhets [Fri, 9 Mar 2012 19:43:46 +0000 (21:43 +0200)]
Project model refactored
Dmitriy Zaporozhets [Fri, 9 Mar 2012 18:48:33 +0000 (20:48 +0200)]
Diasgnostic task for gitlab
Dmitriy Zaporozhets [Fri, 9 Mar 2012 18:05:07 +0000 (20:05 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Fri, 9 Mar 2012 18:04:26 +0000 (20:04 +0200)]
fixed app crash if edit empty project from admin
Dmitriy Zaporozhets [Thu, 8 Mar 2012 10:08:25 +0000 (02:08 -0800)]
Merge pull request #529 from abhid/branch-commit-url-fix
This might fix the issue with commits showing up in the format.
Ariejan de Vroom [Thu, 8 Mar 2012 08:45:23 +0000 (00:45 -0800)]
Merge pull request #530 from yvmarques/patch-1
Changed the read to reflect the needed of mysql
Yvan [Thu, 8 Mar 2012 08:44:26 +0000 (09:44 +0100)]
Changed the read to reflect the needed of mysql
Dmitriy Zaporozhets [Wed, 7 Mar 2012 22:15:31 +0000 (00:15 +0200)]
help updated
Dmitriy Zaporozhets [Wed, 7 Mar 2012 21:55:46 +0000 (23:55 +0200)]
test fix, css refactoring
Dmitriy Zaporozhets [Wed, 7 Mar 2012 19:35:00 +0000 (21:35 +0200)]
still use sqlite for travis
Dmitriy Zaporozhets [Wed, 7 Mar 2012 19:27:38 +0000 (21:27 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Wed, 7 Mar 2012 19:26:26 +0000 (11:26 -0800)]
Merge pull request #517 from gitlabhq/mysql_branch
Gitlab moved to mysql
Dmitriy Zaporozhets [Wed, 7 Mar 2012 19:23:09 +0000 (21:23 +0200)]
sqlite config example
Abhi Devireddy [Wed, 7 Mar 2012 17:41:39 +0000 (11:41 -0600)]
This might fix the issue with commits showing up in the format.
Needs to be tested.
Dmitriy Zaporozhets [Wed, 7 Mar 2012 08:16:43 +0000 (00:16 -0800)]
increased dashboard width
Dmitriy Zaporozhets [Wed, 7 Mar 2012 08:15:43 +0000 (00:15 -0800)]
Fixed invalid commit show if git history broken
Dmitriy Zaporozhets [Wed, 7 Mar 2012 08:13:43 +0000 (00:13 -0800)]
Events improved. Open/close issue, merge request events displayed
Dmitriy Zaporozhets [Wed, 7 Mar 2012 08:12:43 +0000 (00:12 -0800)]
Merge pull request #520 from abhid/default-ssh-username
Removed hardcoded SSH Username on project create/edit form. Fixes Issue #493
Dmitriy Zaporozhets [Wed, 7 Mar 2012 08:12:06 +0000 (00:12 -0800)]
Merge pull request #521 from abhid/testing-post-receive-hook
Adapt to new web_hook_data method. fixes #509
Abhi Devireddy [Wed, 7 Mar 2012 04:26:39 +0000 (22:26 -0600)]
Adapt to new web_hook_data method
Uses the first key that the user has for testing post receive hook.
Abhi Devireddy [Tue, 6 Mar 2012 23:39:07 +0000 (17:39 -0600)]
Removed hardcoded SSH Username on project create/edit form
Dmitriy Zaporozhets [Tue, 6 Mar 2012 17:54:59 +0000 (19:54 +0200)]
Gitlab moved to mysql
Dmitriy Zaporozhets [Mon, 5 Mar 2012 22:29:40 +0000 (00:29 +0200)]
Polishin & fixed tree switch
Dmitriy Zaporozhets [Mon, 5 Mar 2012 22:26:40 +0000 (00:26 +0200)]
Cleaning and refactoring
Dmitriy Zaporozhets [Mon, 5 Mar 2012 22:16:40 +0000 (00:16 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Ariejan de Vroom [Mon, 5 Mar 2012 09:12:10 +0000 (10:12 +0100)]
Merge branch 'kleinmann-fix/web_hook_content_type'
Ariejan de Vroom [Mon, 5 Mar 2012 08:56:14 +0000 (09:56 +0100)]
Merge branch 'fix/web_hook_content_type' of https://github.com/kleinmann/gitlabhq into kleinmann-fix/web_hook_content_type
Uwe Kleinmann [Mon, 5 Mar 2012 01:38:18 +0000 (02:38 +0100)]
Sets correct content type on web hook execution.
Dmitriy Zaporozhets [Sun, 4 Mar 2012 13:35:15 +0000 (15:35 +0200)]
Removed issues,mr delete buttons. Refactored models
Dmitriy Zaporozhets [Sun, 4 Mar 2012 10:35:15 +0000 (12:35 +0200)]
2.3.0 pre
Dmitriy Zaporozhets [Sun, 4 Mar 2012 01:00:19 +0000 (03:00 +0200)]
projects page finished
Dmitriy Zaporozhets [Sat, 3 Mar 2012 11:03:03 +0000 (13:03 +0200)]
get rid of sidebar
Dmitriy Zaporozhets [Sat, 3 Mar 2012 09:23:03 +0000 (11:23 +0200)]
fixed invalid issues link on dashboard
Dmitriy Zaporozhets [Fri, 2 Mar 2012 22:09:17 +0000 (00:09 +0200)]
New projects page
Dmitriy Zaporozhets [Fri, 2 Mar 2012 20:44:30 +0000 (22:44 +0200)]
Key uniq method refactored
Dmitriy Zaporozhets [Fri, 2 Mar 2012 20:33:29 +0000 (22:33 +0200)]
Fix for mysql database cause key is a reserved word
Dmitriy Zaporozhets [Fri, 2 Mar 2012 16:42:28 +0000 (19:42 +0300)]
Prevent Application from crash cause of charloc_cholmes error
Dmitriy Zaporozhets [Thu, 1 Mar 2012 20:56:24 +0000 (22:56 +0200)]
Fixed spec
Dmitriy Zaporozhets [Thu, 1 Mar 2012 20:43:04 +0000 (22:43 +0200)]
Events displayed on project page. \n Fixed theme issue. \n New issue, mr events enabled
Dmitriy Zaporozhets [Thu, 1 Mar 2012 19:23:50 +0000 (21:23 +0200)]
design tab improved. Themes added
Dmitriy Zaporozhets [Thu, 1 Mar 2012 19:02:59 +0000 (21:02 +0200)]
should up to 3.0.1
Dmitriy Zaporozhets [Thu, 1 Mar 2012 18:47:57 +0000 (20:47 +0200)]
improved activity ui
Dmitriy Zaporozhets [Thu, 1 Mar 2012 18:40:32 +0000 (20:40 +0200)]
improved dashboard
Ariejan de Vroom [Thu, 1 Mar 2012 15:43:04 +0000 (16:43 +0100)]
Updated specs for post_receive worker
Ariejan de Vroom [Thu, 1 Mar 2012 15:02:25 +0000 (16:02 +0100)]
Merge branch 'miks-deploy_keys_nonunique'
Ariejan de Vroom [Thu, 1 Mar 2012 15:00:14 +0000 (16:00 +0100)]
Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks-deploy_keys_nonunique
Added/fixed specs
Update spec/factory to allow Factory#new without opts
Conflicts:
app/models/key.rb
Ariejan de Vroom [Thu, 1 Mar 2012 14:09:23 +0000 (15:09 +0100)]
Merge remote-tracking branch 'upstream/master'
Ariejan de Vroom [Thu, 1 Mar 2012 14:03:48 +0000 (06:03 -0800)]
Merge pull request #459 from patthoyts/pt/gravatar-fix
Generate consistent gravatar hash values as per documentation.
Dmitriy Zaporozhets [Wed, 29 Feb 2012 21:34:06 +0000 (23:34 +0200)]
fixed compare for push
Dmitriy Zaporozhets [Wed, 29 Feb 2012 21:21:23 +0000 (23:21 +0200)]
UI mars theme updated. search field improved
Dmitriy Zaporozhets [Wed, 29 Feb 2012 21:04:09 +0000 (23:04 +0200)]
Fixed tests. removed delegate to id
Dmitriy Zaporozhets [Wed, 29 Feb 2012 20:38:24 +0000 (22:38 +0200)]
Send author to post hook. Display push activity to dashboard
Dmitriy Zaporozhets [Wed, 29 Feb 2012 18:05:39 +0000 (20:05 +0200)]
Merge branch 'events' of dev.gitlabhq.com:gitlabhq into events
Dmitriy Zaporozhets [Tue, 28 Feb 2012 18:09:23 +0000 (20:09 +0200)]
Event entity created
Observe issue, merge request, note creation - create event
register push event
Dmitriy Zaporozhets [Tue, 28 Feb 2012 22:45:38 +0000 (00:45 +0200)]
new UI theme - mars
Dmitriy Zaporozhets [Tue, 28 Feb 2012 21:17:12 +0000 (23:17 +0200)]
gem shoulda updated
Dmitriy Zaporozhets [Tue, 28 Feb 2012 21:12:08 +0000 (13:12 -0800)]
Merge pull request #485 from deanperry/master
Fixed spelling mistake - 'yo tour' to 'to your'
Dmitriy Zaporozhets [Tue, 28 Feb 2012 21:08:11 +0000 (23:08 +0200)]
hide admin link for users
Dmitriy Zaporozhets [Tue, 28 Feb 2012 21:01:50 +0000 (23:01 +0200)]
reduced number of recent projects for dashboard to 5
Dmitriy Zaporozhets [Tue, 28 Feb 2012 20:59:36 +0000 (22:59 +0200)]
Added dashboard page. Projects page not root from now
Dean Perry [Tue, 28 Feb 2012 19:35:35 +0000 (19:35 +0000)]
fixed spelling mistake - 'Ream more' to 'read more'
Dean Perry [Tue, 28 Feb 2012 19:31:27 +0000 (19:31 +0000)]
fixed spelling mistake - 'yo tour' to 'to your'
Dmitriy Zaporozhets [Tue, 28 Feb 2012 14:48:15 +0000 (16:48 +0200)]
register push event
Dmitriy Zaporozhets [Tue, 28 Feb 2012 14:01:14 +0000 (16:01 +0200)]
Observe issue, merge request, note creation - create event
Dmitriy Zaporozhets [Tue, 28 Feb 2012 13:09:23 +0000 (15:09 +0200)]
Event entity created
Dmitriy Zaporozhets [Mon, 27 Feb 2012 22:00:19 +0000 (00:00 +0200)]
Improved file browse page, prepared for downloads tab
Dmitriy Zaporozhets [Mon, 27 Feb 2012 18:51:12 +0000 (20:51 +0200)]
tree css fixes
Dmitriy Zaporozhets [Mon, 27 Feb 2012 18:44:13 +0000 (20:44 +0200)]
Added loading animation for notes
Dmitriy Zaporozhets [Mon, 27 Feb 2012 18:34:55 +0000 (20:34 +0200)]
notes count for wall
Dmitriy Zaporozhets [Mon, 27 Feb 2012 18:29:27 +0000 (20:29 +0200)]
notes controller refactored
Dmitriy Zaporozhets [Mon, 27 Feb 2012 17:05:27 +0000 (19:05 +0200)]
fixed notes logic
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