OSDN Git Service

wvm/gitlab.git
11 years agoReduce count of projects on dashboard to 20
randx [Tue, 9 Oct 2012 07:01:07 +0000 (10:01 +0300)]
Reduce count of projects on dashboard to 20

11 years agoGroup: new link on dashboard if admin. Fixed people count
randx [Tue, 9 Oct 2012 06:46:20 +0000 (09:46 +0300)]
Group: new link on dashboard if admin. Fixed people count

11 years agoMerge pull request #1596 from riyad/fix-messages-for-deleted-things
Dmitriy Zaporozhets [Tue, 9 Oct 2012 05:27:25 +0000 (22:27 -0700)]
Merge pull request #1596 from riyad/fix-messages-for-deleted-things

Fix messages for deleted things on dashboard

11 years agoRevert "Do not allow removal of a project owner user."
Valeriy Sizov [Mon, 8 Oct 2012 12:57:30 +0000 (15:57 +0300)]
Revert "Do not allow removal of a project owner user."

This reverts commit 927d0cc2674d21f470a29e7a10577707172f13c6.

11 years agoMerge pull request #1651 from dosire/user_can_be_removed_if_its_not_a_project_owner
Valeriy Sizov [Mon, 8 Oct 2012 12:42:47 +0000 (05:42 -0700)]
Merge pull request #1651 from dosire/user_can_be_removed_if_its_not_a_project_owner

Do not allow removal of a project owner user.

11 years agoMerge pull request #1627 from tsigo/tree_performance
Valeriy Sizov [Mon, 8 Oct 2012 12:36:31 +0000 (05:36 -0700)]
Merge pull request #1627 from tsigo/tree_performance

Tree performance improvements

11 years agoMerge branch 'alexleutgoeb-feature/dashboardfeed'
Dmitriy Zaporozhets [Mon, 8 Oct 2012 11:17:59 +0000 (14:17 +0300)]
Merge branch 'alexleutgoeb-feature/dashboardfeed'

11 years agoFix dashboard atom feed routes
Dmitriy Zaporozhets [Mon, 8 Oct 2012 11:17:46 +0000 (14:17 +0300)]
Fix dashboard atom feed routes

11 years agoMerge branch 'feature/dashboardfeed' of https://github.com/alexleutgoeb/gitlabhq...
Dmitriy Zaporozhets [Mon, 8 Oct 2012 10:52:07 +0000 (13:52 +0300)]
Merge branch 'feature/dashboardfeed' of https://github.com/alexleutgoeb/gitlabhq into alexleutgoeb-feature/dashboardfeed

Conflicts:
app/decorators/event_decorator.rb

11 years agoDo not allow removal of a project owner user.
Marin Jankovski [Mon, 8 Oct 2012 10:41:25 +0000 (12:41 +0200)]
Do not allow removal of a project owner user.

11 years agoMerge pull request #1650 from NARKOZ/api
Dmitriy Zaporozhets [Mon, 8 Oct 2012 09:56:44 +0000 (02:56 -0700)]
Merge pull request #1650 from NARKOZ/api

API for project snippets listing

11 years agoAPI: add project snippets listing
Nihad Abbasov [Mon, 8 Oct 2012 09:13:53 +0000 (02:13 -0700)]
API: add project snippets listing

11 years agoprojects API should return info about deleted hook
Nihad Abbasov [Mon, 8 Oct 2012 08:54:36 +0000 (01:54 -0700)]
projects API should return info about deleted hook

11 years agoadd API changelog
Nihad Abbasov [Mon, 8 Oct 2012 08:52:08 +0000 (01:52 -0700)]
add API changelog

11 years agoMerge pull request #1636 from dosire/consistent_issue_type_order
Dmitriy Zaporozhets [Sun, 7 Oct 2012 08:00:38 +0000 (01:00 -0700)]
Merge pull request #1636 from dosire/consistent_issue_type_order

Reversed order of progress indication so that the text matches the progress bar.

11 years agoMerge pull request #1641 from sodabrew/patch-1
Dmitriy Zaporozhets [Sun, 7 Oct 2012 07:49:59 +0000 (00:49 -0700)]
Merge pull request #1641 from sodabrew/patch-1

Tiny fix to the add/edit groups form path field

11 years agoMerge pull request #1643 from danillonunes/doc-install-fix
Dmitriy Zaporozhets [Sun, 7 Oct 2012 07:49:09 +0000 (00:49 -0700)]
Merge pull request #1643 from danillonunes/doc-install-fix

Doc fix: Nginx init script requires sudo

11 years agoDoc fix: Nginx init script requires sudo
Danillo Nunes [Sun, 7 Oct 2012 00:36:20 +0000 (21:36 -0300)]
Doc fix: Nginx init script requires sudo

11 years agoTiny fix to the add/edit groups form path field
Aaron Stone [Sat, 6 Oct 2012 06:46:15 +0000 (23:46 -0700)]
Tiny fix to the add/edit groups form path field

11 years agoreversed order of progress indication for visual harmony so that text matches the...
joseph Borremans [Fri, 5 Oct 2012 15:48:52 +0000 (17:48 +0200)]
reversed order of progress indication for visual harmony so that text matches the progress bar

11 years agoMerge pull request #1632 from NARKOZ/patch-0
Dmitriy Zaporozhets [Fri, 5 Oct 2012 14:48:43 +0000 (07:48 -0700)]
Merge pull request #1632 from NARKOZ/patch-0

performance and security fixes

11 years agomove emoji module to lib
Nihad Abbasov [Fri, 5 Oct 2012 14:42:23 +0000 (07:42 -0700)]
move emoji module to lib

11 years agono need to add fonts to assets path
Nihad Abbasov [Fri, 5 Oct 2012 14:22:21 +0000 (07:22 -0700)]
no need to add fonts to assets path

11 years agoimprove emoji checking performance
Nihad Abbasov [Fri, 5 Oct 2012 14:13:21 +0000 (07:13 -0700)]
improve emoji checking performance

11 years agospecify HTTP verbs for match in routes
Nihad Abbasov [Fri, 5 Oct 2012 12:22:01 +0000 (05:22 -0700)]
specify HTTP verbs for match in routes

11 years agoFix tests
Dmitriy Zaporozhets [Fri, 5 Oct 2012 14:01:44 +0000 (17:01 +0300)]
Fix tests

11 years agoRemove leftover ref_extractor_spec file
Robert Speicher [Thu, 4 Oct 2012 18:30:31 +0000 (14:30 -0400)]
Remove leftover ref_extractor_spec file

Apparently it didn't get removed after the rename to ExtractsPath.

11 years agoRevert "Use official Grit 2.5.0"
Robert Speicher [Thu, 4 Oct 2012 18:19:17 +0000 (14:19 -0400)]
Revert "Use official Grit 2.5.0"

This reverts commit 187e192cdf4470fa07a62aa0720c586b6dde2bde.

[ci skip]

11 years agoExtractsPath: Use ref_names instead of branches+tags
Robert Speicher [Thu, 4 Oct 2012 18:13:52 +0000 (14:13 -0400)]
ExtractsPath: Use ref_names instead of branches+tags

11 years agoFix bug with branches whose name contains slash
Valeriy Sizov [Thu, 4 Oct 2012 16:31:31 +0000 (19:31 +0300)]
Fix bug with branches whose name contains slash

11 years agoadded trace to travis
Valeriy Sizov [Thu, 4 Oct 2012 10:55:29 +0000 (13:55 +0300)]
added trace to travis

11 years agoruby version changed
Valeriy Sizov [Thu, 4 Oct 2012 10:48:20 +0000 (13:48 +0300)]
ruby version changed

11 years agoMinore code-style fixes
Valeriy Sizov [Thu, 4 Oct 2012 10:40:40 +0000 (13:40 +0300)]
Minore code-style fixes

11 years agoMerge branch 'diff_bug'
Valeriy Sizov [Thu, 4 Oct 2012 10:29:27 +0000 (13:29 +0300)]
Merge branch 'diff_bug'

11 years agofix inline diff
Valeriy Sizov [Thu, 4 Oct 2012 10:28:58 +0000 (13:28 +0300)]
fix inline diff

11 years agoEscape html entities in commit messages
Alex Leutgöb [Thu, 4 Oct 2012 08:06:17 +0000 (10:06 +0200)]
Escape html entities in commit messages

11 years agoFixed group issues/mr. Also speedup project list of admin area
Dmitriy Zaporozhets [Thu, 4 Oct 2012 07:51:35 +0000 (10:51 +0300)]
Fixed group issues/mr. Also speedup project list of admin area

11 years agoUse official Grit 2.5.0
Robert Speicher [Wed, 3 Oct 2012 23:11:39 +0000 (19:11 -0400)]
Use official Grit 2.5.0

11 years agoAdd render_tree helper; simplify (speed up) tree_icon
Robert Speicher [Wed, 3 Oct 2012 22:40:56 +0000 (18:40 -0400)]
Add render_tree helper; simplify (speed up) tree_icon

11 years agoRemove locals from tree/submodule_item, use "object" instead
Robert Speicher [Wed, 3 Oct 2012 22:30:27 +0000 (18:30 -0400)]
Remove locals from tree/submodule_item, use "object" instead

11 years agoTree.init() JS is no longer required
Robert Speicher [Wed, 3 Oct 2012 22:29:15 +0000 (18:29 -0400)]
Tree.init() JS is no longer required

11 years agoRemove locals from tree/tree_file and just use "object" instead
Robert Speicher [Wed, 3 Oct 2012 22:28:50 +0000 (18:28 -0400)]
Remove locals from tree/tree_file and just use "object" instead

11 years agoRename tree.js to tree.js.coffee
Robert Speicher [Wed, 3 Oct 2012 21:01:16 +0000 (17:01 -0400)]
Rename tree.js to tree.js.coffee

11 years agoImplement pending dashboard step
randx [Wed, 3 Oct 2012 20:46:55 +0000 (23:46 +0300)]
Implement pending dashboard step

11 years agoBigger fonts for groups box
randx [Wed, 3 Oct 2012 16:51:14 +0000 (19:51 +0300)]
Bigger fonts for groups box

11 years agoMerge pull request #1592 from jouve/devise_layout
Dmitriy Zaporozhets [Wed, 3 Oct 2012 14:06:08 +0000 (07:06 -0700)]
Merge pull request #1592 from jouve/devise_layout

make devise controllers use devise layout

11 years agoReal fix for removing keys. Closes PR #1616
Dmitriy Zaporozhets [Wed, 3 Oct 2012 12:56:41 +0000 (15:56 +0300)]
Real fix for removing keys. Closes PR #1616

11 years agoMerge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq
Valery Sizov [Wed, 3 Oct 2012 12:17:48 +0000 (12:17 +0000)]
Merge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq

11 years agoDont change params hash. Use dup instead
Dmitriy Zaporozhets [Wed, 3 Oct 2012 12:02:02 +0000 (15:02 +0300)]
Dont change params hash. Use dup instead

11 years agoSQL Fixes
Dmitriy Zaporozhets [Wed, 3 Oct 2012 11:26:37 +0000 (14:26 +0300)]
SQL Fixes

11 years agoSpianch test for group dashboard
Dmitriy Zaporozhets [Wed, 3 Oct 2012 10:42:17 +0000 (13:42 +0300)]
Spianch test for group dashboard

11 years agoFactories spec refactoring after #1616
Valeriy Sizov [Wed, 3 Oct 2012 10:33:31 +0000 (13:33 +0300)]
Factories spec refactoring after #1616

11 years agoMerge pull request #1617 from dosire/reject-ssh-keys-that-break-gitolite
Valeriy Sizov [Wed, 3 Oct 2012 10:18:08 +0000 (03:18 -0700)]
Merge pull request #1617 from dosire/reject-ssh-keys-that-break-gitolite

Reject ssh keys that break gitolite

11 years agoAdded ability to manage groups from admin
Dmitriy Zaporozhets [Wed, 3 Oct 2012 09:49:43 +0000 (12:49 +0300)]
Added ability to manage groups from admin

11 years agoMerge pull request #1613 from tsigo/performance
Dmitriy Zaporozhets [Wed, 3 Oct 2012 09:03:32 +0000 (02:03 -0700)]
Merge pull request #1613 from tsigo/performance

Improve performance of Commits#show

11 years agoCache the value of safe_message
Robert Speicher [Tue, 2 Oct 2012 22:57:13 +0000 (18:57 -0400)]
Cache the value of safe_message

Also, just for extra paranoia, only call safe_message once in the
decorator methods

Adds specs to make sure it still works

11 years agoUse branches.length and tags.length instead of [whatever]_count
Robert Speicher [Tue, 2 Oct 2012 22:42:39 +0000 (18:42 -0400)]
Use branches.length and tags.length instead of [whatever]_count

11 years agoAdded back link. cleanup group show page
randx [Tue, 2 Oct 2012 19:08:30 +0000 (22:08 +0300)]
Added back link. cleanup group show page

11 years agoMove all stuff to groups controller
randx [Tue, 2 Oct 2012 17:42:15 +0000 (20:42 +0300)]
Move all stuff to groups controller

11 years agoGroup filtering on dashboard
Dmitriy Zaporozhets [Tue, 2 Oct 2012 16:37:53 +0000 (19:37 +0300)]
Group filtering on dashboard

11 years agoAdmin Group scaffold -> new, show, index
Dmitriy Zaporozhets [Tue, 2 Oct 2012 16:01:40 +0000 (19:01 +0300)]
Admin Group scaffold -> new, show, index

11 years agoAPI: fix documentation
Valeriy Sizov [Tue, 2 Oct 2012 15:52:19 +0000 (18:52 +0300)]
API: fix documentation

11 years agoAPI: private token via header
Valeriy Sizov [Tue, 2 Oct 2012 15:43:35 +0000 (18:43 +0300)]
API: private token via header

11 years agorefactored factory + fixed tests
Dmitriy Zaporozhets [Tue, 2 Oct 2012 15:20:46 +0000 (18:20 +0300)]
refactored factory + fixed tests

11 years agoGroup entity. Group has many projects
Dmitriy Zaporozhets [Tue, 2 Oct 2012 15:17:12 +0000 (18:17 +0300)]
Group entity. Group has many projects

11 years ago#1606 Fixes
Valeriy Sizov [Tue, 2 Oct 2012 15:08:04 +0000 (18:08 +0300)]
#1606 Fixes

11 years ago#1606 API private token via the header
Valeriy Sizov [Tue, 2 Oct 2012 15:02:21 +0000 (18:02 +0300)]
#1606 API private token via the header

11 years agofix TYPO
Valeriy Sizov [Tue, 2 Oct 2012 13:34:20 +0000 (16:34 +0300)]
fix TYPO

11 years agoUpdate linguist and pygments #1602
Valeriy Sizov [Tue, 2 Oct 2012 13:29:03 +0000 (16:29 +0300)]
Update linguist and pygments #1602

11 years agoMerge branch 'api_for_user_creation' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 2 Oct 2012 12:05:28 +0000 (12:05 +0000)]
Merge branch 'api_for_user_creation' of dev.gitlabhq.com:gitlabhq

11 years agoMerge branch 'master' into fix-messages-for-deleted-things
Riyad Preukschas [Tue, 2 Oct 2012 12:04:34 +0000 (14:04 +0200)]
Merge branch 'master' into fix-messages-for-deleted-things

11 years ago#1585 Api for user creation: rspec
Valeriy Sizov [Tue, 2 Oct 2012 10:59:22 +0000 (13:59 +0300)]
#1585 Api for user creation: rspec

11 years ago#1585 Api for user creation: create help
Valeriy Sizov [Tue, 2 Oct 2012 09:52:13 +0000 (12:52 +0300)]
#1585 Api for user creation: create help

11 years ago#1585 Api for user creation: base implementation
Valeriy Sizov [Tue, 2 Oct 2012 09:46:01 +0000 (12:46 +0300)]
#1585 Api for user creation: base implementation

11 years agoactually fix the build
Nihad Abbasov [Tue, 2 Oct 2012 09:32:59 +0000 (15:32 +0600)]
actually fix the build

11 years agofix build
Nihad Abbasov [Tue, 2 Oct 2012 09:27:21 +0000 (15:27 +0600)]
fix build

11 years agoUse class instead id for css styles
Dmitriy Zaporozhets [Tue, 2 Oct 2012 07:26:24 +0000 (10:26 +0300)]
Use class instead id for css styles

11 years agoRefactoring event views
Dmitriy Zaporozhets [Mon, 1 Oct 2012 13:58:13 +0000 (16:58 +0300)]
Refactoring event views

11 years agoRefactored events output. Added links to authors of events
Dmitriy Zaporozhets [Mon, 1 Oct 2012 13:39:19 +0000 (16:39 +0300)]
Refactored events output. Added links to authors of events

11 years agoremove unnecessary step from install guide
Valeriy Sizov [Mon, 1 Oct 2012 12:33:25 +0000 (15:33 +0300)]
remove unnecessary step from install guide

11 years agoMerge pull request #1594 from riyad/fix-completion-for-per-line-forms
Dmitriy Zaporozhets [Sun, 30 Sep 2012 15:15:09 +0000 (08:15 -0700)]
Merge pull request #1594 from riyad/fix-completion-for-per-line-forms

Fix completion for per line forms

11 years agoClarify deletion messages
Riyad Preukschas [Sun, 30 Sep 2012 13:04:43 +0000 (15:04 +0200)]
Clarify deletion messages

11 years agoFix completion for per line forms
Riyad Preukschas [Sun, 30 Sep 2012 10:07:45 +0000 (12:07 +0200)]
Fix completion for per line forms

11 years agoDon't link to removed ref
Riyad Preukschas [Sat, 29 Sep 2012 22:53:21 +0000 (00:53 +0200)]
Don't link to removed ref

11 years agoFix double ref_type in push event when removing branch or tag
Riyad Preukschas [Sat, 29 Sep 2012 22:53:04 +0000 (00:53 +0200)]
Fix double ref_type in push event when removing branch or tag

11 years agoMerge pull request #1590 from thomwiggers/patch-1
Valeriy Sizov [Sat, 29 Sep 2012 12:55:43 +0000 (05:55 -0700)]
Merge pull request #1590 from thomwiggers/patch-1

fixed some grammar stuff

11 years agoall devise controller use devise layout
Cyril [Sat, 29 Sep 2012 11:01:13 +0000 (13:01 +0200)]
all devise controller use devise layout

11 years agofixed some grammar stuff
Thom Wiggers [Fri, 28 Sep 2012 23:36:06 +0000 (02:36 +0300)]
fixed some grammar stuff

Fixed a few things (wont -> won't, "a code")

11 years agocommit show page styled a bit
Dmitriy Zaporozhets [Fri, 28 Sep 2012 13:05:54 +0000 (16:05 +0300)]
commit show page styled a bit

11 years agoMerge pull request #1582 from Kouno/nfs-fix
Dmitriy Zaporozhets [Fri, 28 Sep 2012 10:07:13 +0000 (03:07 -0700)]
Merge pull request #1582 from Kouno/nfs-fix

Fix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment.

11 years agoFix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment.
Vincent Bonmalais [Fri, 28 Sep 2012 04:42:31 +0000 (14:42 +1000)]
Fix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment.

When working inside of a Vagrant box with NFS enabled, the deletion of a
repository in tmp/ doesn't work every time.

It is related to NFS inability to delete a folder if it's still used by
a resource (e.g. `rm -rf ./folder` would leave the folder and a .nfs*
    file in it). In this case it's the temporary repository which can't
be deleted because `ga_repo` is still using it.

De-allocating ga_repo is not possible (thanks Ruby), but deleting the
folder it points to in the first place fixes the issue.

Reference:
http://stackoverflow.com/questions/11228079/python-remove-directory-error-file-exists

11 years agoblue hover
randx [Thu, 27 Sep 2012 20:59:41 +0000 (23:59 +0300)]
blue hover

11 years agoMove ProjectHooks from spec/requests to spinach
randx [Thu, 27 Sep 2012 20:52:08 +0000 (23:52 +0300)]
Move ProjectHooks from spec/requests to spinach

11 years agotests for: Profile -> History
randx [Thu, 27 Sep 2012 20:23:11 +0000 (23:23 +0300)]
tests for: Profile -> History

11 years agoMerge pull request #1569 from jouve/simplify_controllers2
Dmitriy Zaporozhets [Thu, 27 Sep 2012 19:53:01 +0000 (12:53 -0700)]
Merge pull request #1569 from jouve/simplify_controllers2

Simplify controllers and layout handling

11 years agorename ProjectController to ProjectResourceController
Cyril [Thu, 27 Sep 2012 18:59:42 +0000 (20:59 +0200)]
rename ProjectController to ProjectResourceController

11 years agoMerge pull request #1526 from namtzigla/dot-repos-names
Dmitriy Zaporozhets [Thu, 27 Sep 2012 17:22:33 +0000 (10:22 -0700)]
Merge pull request #1526 from namtzigla/dot-repos-names

changed the post-receive hook in order to push the correct repository

11 years agoMinor doc fix
Robert Speicher [Thu, 27 Sep 2012 17:12:11 +0000 (13:12 -0400)]
Minor doc fix

11 years agoFix back button for tree navigation
randx [Thu, 27 Sep 2012 16:38:52 +0000 (19:38 +0300)]
Fix back button for tree navigation

11 years agoDont show compare link if only one commit in push
randx [Thu, 27 Sep 2012 14:13:26 +0000 (17:13 +0300)]
Dont show compare link if only one commit in push