OSDN Git Service
Dmitriy Zaporozhets [Wed, 9 Nov 2011 18:32:56 +0000 (20:32 +0200)]
Merge branch 'dev'
Dmitriy Zaporozhets [Wed, 9 Nov 2011 18:32:08 +0000 (20:32 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Wed, 9 Nov 2011 18:31:52 +0000 (20:31 +0200)]
Merge branch 'dev'
Dmitriy Zaporozhets [Wed, 9 Nov 2011 18:30:34 +0000 (20:30 +0200)]
Merge branch 'master' into dev
Dmitriy Zaporozhets [Wed, 9 Nov 2011 18:29:59 +0000 (20:29 +0200)]
Merge branch 'dev'
Conflicts:
app/helpers/dashboard_helper.rb
Dmitriy Zaporozhets [Wed, 9 Nov 2011 16:47:53 +0000 (18:47 +0200)]
Merge branch 'dev'
Dmitriy Zaporozhets [Wed, 9 Nov 2011 16:05:47 +0000 (08:05 -0800)]
Merge pull request #81 from ariejan/fix_for_dashboard_grit_commit
Show commits as 'Commit' instead of 'Grit::Commit'
Ariejan de Vroom [Wed, 9 Nov 2011 15:59:51 +0000 (16:59 +0100)]
Show commits as 'Commit' instead of 'Grit::Commit'
Dmitriy Zaporozhets [Wed, 9 Nov 2011 14:24:27 +0000 (06:24 -0800)]
Merge pull request #78 from ariejan/fix_gemfile_shoulda
Moved shoulda to the :test group in Gemfile.
Dmitriy Zaporozhets [Wed, 9 Nov 2011 14:23:53 +0000 (06:23 -0800)]
Merge pull request #79 from ariejan/fix_https_gravatar
Use secure.gravatar.com when running over SSL
Ariejan de Vroom [Wed, 9 Nov 2011 14:15:21 +0000 (15:15 +0100)]
Use secure.gravatar.com when running over SSL
Nihad Abbasov [Wed, 9 Nov 2011 13:53:15 +0000 (17:53 +0400)]
fix elsif statement
Ariejan de Vroom [Wed, 9 Nov 2011 13:29:09 +0000 (14:29 +0100)]
Moved shoulda to the :test group in Gemfile. This prevennts `rake test`
from running after every other rake command.
gitlabhq [Wed, 9 Nov 2011 11:37:01 +0000 (06:37 -0500)]
dashboard beautify
Dmitriy Zaporozhets [Tue, 8 Nov 2011 23:56:10 +0000 (01:56 +0200)]
project dashboard updated
Aleksei Kvitinskii [Tue, 8 Nov 2011 21:19:42 +0000 (23:19 +0200)]
Merge branch 'issue-184' into dev
Conflicts:
app/views/layouts/project.html.haml
app/views/projects/_form.html.haml
Aleksei Kvitinskii [Tue, 8 Nov 2011 21:02:57 +0000 (23:02 +0200)]
implemented cookie remember option for issue page filter
gitlabhq [Tue, 8 Nov 2011 17:26:28 +0000 (12:26 -0500)]
Merge branch 'dev'
gitlabhq [Tue, 8 Nov 2011 17:23:13 +0000 (12:23 -0500)]
project form fixed
Aleksei Kvitinskii [Mon, 7 Nov 2011 22:02:50 +0000 (00:02 +0200)]
fix typo
Dmitriy Zaporozhets [Mon, 7 Nov 2011 21:22:25 +0000 (23:22 +0200)]
Merge branch 'dev'
Dmitriy Zaporozhets [Mon, 7 Nov 2011 20:48:55 +0000 (22:48 +0200)]
restored sortable ability
Dmitriy Zaporozhets [Mon, 7 Nov 2011 20:32:01 +0000 (22:32 +0200)]
Merge branch 'issues_restyle' into dev
Dmitriy Zaporozhets [Mon, 7 Nov 2011 20:31:51 +0000 (22:31 +0200)]
fixed tests
Aleksei Kvitinskii [Mon, 7 Nov 2011 19:39:24 +0000 (21:39 +0200)]
fix typo in the template
Aleksei Kvitinskii [Mon, 7 Nov 2011 19:29:28 +0000 (21:29 +0200)]
Merge branch 'dev' into issue-184
Conflicts:
app/views/layouts/project.html.haml
Aleksei Kvitinskii [Mon, 7 Nov 2011 18:38:54 +0000 (20:38 +0200)]
add tags to admin project form
Aleksei Kvitinskii [Mon, 7 Nov 2011 18:37:32 +0000 (20:37 +0200)]
correct padding in user, keys, password forms
Aleksei Kvitinskii [Mon, 7 Nov 2011 18:21:42 +0000 (20:21 +0200)]
correct padding in issue form and in profile form
Aleksei Kvitinskii [Mon, 7 Nov 2011 17:48:58 +0000 (19:48 +0200)]
add tag links to project page
gitlabhq [Mon, 7 Nov 2011 16:31:05 +0000 (11:31 -0500)]
issues table header
gitlabhq [Mon, 7 Nov 2011 15:55:16 +0000 (10:55 -0500)]
issue restyle example
Aleksei Kvitinskii [Mon, 7 Nov 2011 12:12:46 +0000 (14:12 +0200)]
implemented cookie remember option for issue page filter
Aleksei Kvitinskii [Mon, 7 Nov 2011 11:40:22 +0000 (13:40 +0200)]
move tag path to the appropriate helper
Aleksei Kvitinskii [Mon, 7 Nov 2011 09:20:20 +0000 (11:20 +0200)]
Merge branch 'dev' into issue-184
Dmitriy Zaporozhets [Sun, 6 Nov 2011 22:24:09 +0000 (00:24 +0200)]
lil css style
Dmitriy Zaporozhets [Sun, 6 Nov 2011 21:32:37 +0000 (23:32 +0200)]
fixed duplicate on wall
Dmitriy Zaporozhets [Sun, 6 Nov 2011 21:13:52 +0000 (23:13 +0200)]
Merge branch 'dev' into gh_master
Dmitriy Zaporozhets [Sun, 6 Nov 2011 20:54:17 +0000 (22:54 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Sun, 6 Nov 2011 20:53:54 +0000 (22:53 +0200)]
Merge branch 'dev'
Dmitriy Zaporozhets [Sun, 6 Nov 2011 20:53:36 +0000 (22:53 +0200)]
fixed 1click repo url selection
Dmitriy Zaporozhets [Sun, 6 Nov 2011 20:38:08 +0000 (22:38 +0200)]
Improved commit author detection
Dmitriy Zaporozhets [Sun, 6 Nov 2011 20:21:48 +0000 (22:21 +0200)]
link to author on tree view item
Aleksei Kvitinskii [Sun, 6 Nov 2011 19:43:34 +0000 (21:43 +0200)]
fix small bug in top menu (buttons change height on press in chrome)
Dmitriy Zaporozhets [Sun, 6 Nov 2011 19:12:23 +0000 (21:12 +0200)]
fixed conflicts
Dmitriy Zaporozhets [Sun, 6 Nov 2011 19:07:56 +0000 (21:07 +0200)]
Merge branch 'dev'
Conflicts:
app/assets/images/ajax-loader.gif
public/favicon.ico
Aleksei Kvitinskii [Sun, 6 Nov 2011 18:48:21 +0000 (20:48 +0200)]
correct html on project page
Aleksei Kvitinskii [Sun, 6 Nov 2011 18:48:21 +0000 (20:48 +0200)]
correct html on project page
Aleksei Kvitinskii [Sun, 6 Nov 2011 17:22:25 +0000 (19:22 +0200)]
Merge branch 'dev' into issue-184
Aleksei Kvitinskii [Sun, 6 Nov 2011 17:21:51 +0000 (19:21 +0200)]
Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev
Dmitriy Zaporozhets [Sun, 6 Nov 2011 13:52:23 +0000 (15:52 +0200)]
lil design changes
Aleksei Kvitinskii [Sat, 5 Nov 2011 20:21:03 +0000 (22:21 +0200)]
Implement tags cloud support for projects
Aleksei Kvitinskii [Sat, 5 Nov 2011 20:21:03 +0000 (22:21 +0200)]
Merge branch 'dev' into issue-184
Aleksei Kvitinskii [Sat, 5 Nov 2011 20:16:13 +0000 (22:16 +0200)]
add tags to project list
Aleksei Kvitinskii [Sat, 5 Nov 2011 19:00:05 +0000 (21:00 +0200)]
create tags page and made tag filter for projects
Dmitriy Zaporozhets [Sat, 5 Nov 2011 13:31:54 +0000 (15:31 +0200)]
issues & fixed layout
Aleksei Kvitinskii [Sat, 5 Nov 2011 12:57:40 +0000 (14:57 +0200)]
add tags autocomplete
Dmitriy Zaporozhets [Sat, 5 Nov 2011 12:45:52 +0000 (14:45 +0200)]
commits notes under diff. tab removed
Dmitriy Zaporozhets [Sat, 5 Nov 2011 12:26:06 +0000 (14:26 +0200)]
commit paging fixes
Dmitriy Zaporozhets [Sat, 5 Nov 2011 11:59:43 +0000 (13:59 +0200)]
fixed notes loading/paging
Aleksei Kvitinskii [Sat, 5 Nov 2011 06:15:31 +0000 (08:15 +0200)]
Merge branch 'dev' into issue-184
gitlabhq [Fri, 4 Nov 2011 16:20:52 +0000 (12:20 -0400)]
css fixes
gitlabhq [Fri, 4 Nov 2011 15:59:00 +0000 (11:59 -0400)]
fixes
gitlabhq [Fri, 4 Nov 2011 15:47:28 +0000 (11:47 -0400)]
Merge branch 'dev'
gitlabhq [Fri, 4 Nov 2011 15:46:51 +0000 (11:46 -0400)]
refactored too
gitlabhq [Fri, 4 Nov 2011 13:37:38 +0000 (09:37 -0400)]
wall login in progress
Aleksei Kvitinskii [Fri, 4 Nov 2011 08:11:14 +0000 (10:11 +0200)]
added tags to form
Dmitriy Zaporozhets [Fri, 4 Nov 2011 07:46:58 +0000 (09:46 +0200)]
fixed brach switch
Aleksei Kvitinskii [Fri, 4 Nov 2011 07:42:36 +0000 (09:42 +0200)]
integrate tags plugins
Aleksei Kvitinskii [Thu, 3 Nov 2011 23:16:12 +0000 (01:16 +0200)]
increase max size of public to 1600 bytes
Dmitriy Zaporozhets [Thu, 3 Nov 2011 22:37:47 +0000 (00:37 +0200)]
Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev
Dmitriy Zaporozhets [Thu, 3 Nov 2011 22:37:02 +0000 (00:37 +0200)]
fixed/fluid layout switch
gitlabhq [Thu, 3 Nov 2011 16:28:33 +0000 (12:28 -0400)]
new ref switch
gitlabhq [Thu, 3 Nov 2011 14:36:02 +0000 (10:36 -0400)]
new favicon
gitlabhq [Thu, 3 Nov 2011 14:19:00 +0000 (10:19 -0400)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
gitlabhq [Thu, 3 Nov 2011 14:18:32 +0000 (10:18 -0400)]
Merge branch 'dev'
gitlabhq [Thu, 3 Nov 2011 11:00:16 +0000 (07:00 -0400)]
dashboard is now root path
gitlabhq [Thu, 3 Nov 2011 10:56:26 +0000 (06:56 -0400)]
fixed error with ascii error for dashboard
gitlabhq [Wed, 2 Nov 2011 20:18:02 +0000 (22:18 +0200)]
Merge branch 'dev'
gitlabhq [Wed, 2 Nov 2011 20:14:03 +0000 (22:14 +0200)]
dashboard
gitlabhq [Wed, 2 Nov 2011 18:59:06 +0000 (20:59 +0200)]
Merge branch 'dev' into user_dashboard
gitlabhq [Wed, 2 Nov 2011 15:21:17 +0000 (11:21 -0400)]
view refactoring
gitlabhq [Tue, 1 Nov 2011 22:19:29 +0000 (00:19 +0200)]
body class
gitlabhq [Tue, 1 Nov 2011 20:56:58 +0000 (22:56 +0200)]
Merge branch 'dev' into user_dashboard
Conflicts:
app/views/layouts/_head_panel.html.erb
gitlabhq [Tue, 1 Nov 2011 20:51:20 +0000 (22:51 +0200)]
fixes
gitlabhq [Tue, 1 Nov 2011 20:11:24 +0000 (22:11 +0200)]
commits + tree in progress
gitlabhq [Tue, 1 Nov 2011 18:29:46 +0000 (20:29 +0200)]
Merge branch 'dev' into new_layout
Conflicts:
app/assets/stylesheets/projects.css.scss
gitlabhq [Tue, 1 Nov 2011 11:17:36 +0000 (13:17 +0200)]
issues fix layout
gitlabhq [Tue, 1 Nov 2011 10:48:26 +0000 (12:48 +0200)]
commits page
gitlabhq [Tue, 1 Nov 2011 09:22:16 +0000 (11:22 +0200)]
updated
gitlabhq [Tue, 1 Nov 2011 09:00:59 +0000 (11:00 +0200)]
project page fixed
gitlabhq [Mon, 31 Oct 2011 20:57:16 +0000 (22:57 +0200)]
user dashboard
Nihad Abbasov [Mon, 31 Oct 2011 19:37:09 +0000 (23:37 +0400)]
Merge branch 'issue-101' into dev
Nihad Abbasov [Mon, 31 Oct 2011 19:21:28 +0000 (23:21 +0400)]
fix issue notification properly
Nihad Abbasov [Mon, 31 Oct 2011 13:34:22 +0000 (17:34 +0400)]
make commit messages multiline
Nihad Abbasov [Mon, 31 Oct 2011 12:49:38 +0000 (16:49 +0400)]
don't send notification to issue creator
Nihad Abbasov [Mon, 31 Oct 2011 12:20:41 +0000 (16:20 +0400)]
install letter_opener
gitlabhq [Mon, 31 Oct 2011 10:30:53 +0000 (13:30 +0300)]
commit
gitlabhq [Mon, 31 Oct 2011 10:11:46 +0000 (13:11 +0300)]
Merge branch 'dev' into new_layout
gitlabhq [Mon, 31 Oct 2011 10:11:22 +0000 (13:11 +0300)]
icons & css