OSDN Git Service
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 [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
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
Pat Thoyts [Thu, 23 Feb 2012 15:47:04 +0000 (15:47 +0000)]
Generate consistent gravatar hash values as per documentation.
The gravatar documentation on implementing the hash specifies that leading
and trailing whitespace must be trimmed and all characters should be forced
to lowercase.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
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 [Wed, 22 Feb 2012 05:14:54 +0000 (07:14 +0200)]
better error handling for not found resource, gitolite error
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