OSDN Git Service
Dmitriy Zaporozhets [Mon, 8 Oct 2012 11:17:46 +0000 (14:17 +0300)]
Fix dashboard atom feed routes
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
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
Nihad Abbasov [Mon, 8 Oct 2012 09:13:53 +0000 (02:13 -0700)]
API: add project snippets listing
Nihad Abbasov [Mon, 8 Oct 2012 08:54:36 +0000 (01:54 -0700)]
projects API should return info about deleted hook
Nihad Abbasov [Mon, 8 Oct 2012 08:52:08 +0000 (01:52 -0700)]
add API changelog
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.
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
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
Danillo Nunes [Sun, 7 Oct 2012 00:36:20 +0000 (21:36 -0300)]
Doc fix: Nginx init script requires sudo
Aaron Stone [Sat, 6 Oct 2012 06:46:15 +0000 (23:46 -0700)]
Tiny fix to the add/edit groups form path field
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
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
Nihad Abbasov [Fri, 5 Oct 2012 14:42:23 +0000 (07:42 -0700)]
move emoji module to lib
Nihad Abbasov [Fri, 5 Oct 2012 14:22:21 +0000 (07:22 -0700)]
no need to add fonts to assets path
Nihad Abbasov [Fri, 5 Oct 2012 14:13:21 +0000 (07:13 -0700)]
improve emoji checking performance
Nihad Abbasov [Fri, 5 Oct 2012 12:22:01 +0000 (05:22 -0700)]
specify HTTP verbs for match in routes
Dmitriy Zaporozhets [Fri, 5 Oct 2012 14:01:44 +0000 (17:01 +0300)]
Fix tests
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.
Robert Speicher [Thu, 4 Oct 2012 18:13:52 +0000 (14:13 -0400)]
ExtractsPath: Use ref_names instead of branches+tags
Valeriy Sizov [Thu, 4 Oct 2012 16:31:31 +0000 (19:31 +0300)]
Fix bug with branches whose name contains slash
Valeriy Sizov [Thu, 4 Oct 2012 10:55:29 +0000 (13:55 +0300)]
added trace to travis
Valeriy Sizov [Thu, 4 Oct 2012 10:48:20 +0000 (13:48 +0300)]
ruby version changed
Valeriy Sizov [Thu, 4 Oct 2012 10:40:40 +0000 (13:40 +0300)]
Minore code-style fixes
Valeriy Sizov [Thu, 4 Oct 2012 10:29:27 +0000 (13:29 +0300)]
Merge branch 'diff_bug'
Valeriy Sizov [Thu, 4 Oct 2012 10:28:58 +0000 (13:28 +0300)]
fix inline diff
Alex Leutgöb [Thu, 4 Oct 2012 08:06:17 +0000 (10:06 +0200)]
Escape html entities in commit messages
Dmitriy Zaporozhets [Thu, 4 Oct 2012 07:51:35 +0000 (10:51 +0300)]
Fixed group issues/mr. Also speedup project list of admin area
randx [Wed, 3 Oct 2012 20:46:55 +0000 (23:46 +0300)]
Implement pending dashboard step
randx [Wed, 3 Oct 2012 16:51:14 +0000 (19:51 +0300)]
Bigger fonts for groups box
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
Dmitriy Zaporozhets [Wed, 3 Oct 2012 12:56:41 +0000 (15:56 +0300)]
Real fix for removing keys. Closes PR #1616
Valery Sizov [Wed, 3 Oct 2012 12:17:48 +0000 (12:17 +0000)]
Merge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Wed, 3 Oct 2012 12:02:02 +0000 (15:02 +0300)]
Dont change params hash. Use dup instead
Dmitriy Zaporozhets [Wed, 3 Oct 2012 11:26:37 +0000 (14:26 +0300)]
SQL Fixes
Dmitriy Zaporozhets [Wed, 3 Oct 2012 10:42:17 +0000 (13:42 +0300)]
Spianch test for group dashboard
Valeriy Sizov [Wed, 3 Oct 2012 10:33:31 +0000 (13:33 +0300)]
Factories spec refactoring after #1616
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
Dmitriy Zaporozhets [Wed, 3 Oct 2012 09:49:43 +0000 (12:49 +0300)]
Added ability to manage groups from admin
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
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
Robert Speicher [Tue, 2 Oct 2012 22:42:39 +0000 (18:42 -0400)]
Use branches.length and tags.length instead of [whatever]_count
randx [Tue, 2 Oct 2012 19:08:30 +0000 (22:08 +0300)]
Added back link. cleanup group show page
randx [Tue, 2 Oct 2012 17:42:15 +0000 (20:42 +0300)]
Move all stuff to groups controller
Dmitriy Zaporozhets [Tue, 2 Oct 2012 16:37:53 +0000 (19:37 +0300)]
Group filtering on dashboard
Dmitriy Zaporozhets [Tue, 2 Oct 2012 16:01:40 +0000 (19:01 +0300)]
Admin Group scaffold -> new, show, index
Valeriy Sizov [Tue, 2 Oct 2012 15:52:19 +0000 (18:52 +0300)]
API: fix documentation
Valeriy Sizov [Tue, 2 Oct 2012 15:43:35 +0000 (18:43 +0300)]
API: private token via header
Dmitriy Zaporozhets [Tue, 2 Oct 2012 15:20:46 +0000 (18:20 +0300)]
refactored factory + fixed tests
Dmitriy Zaporozhets [Tue, 2 Oct 2012 15:17:12 +0000 (18:17 +0300)]
Group entity. Group has many projects
Valeriy Sizov [Tue, 2 Oct 2012 15:08:04 +0000 (18:08 +0300)]
#1606 Fixes
Valeriy Sizov [Tue, 2 Oct 2012 15:02:21 +0000 (18:02 +0300)]
#1606 API private token via the header
Valeriy Sizov [Tue, 2 Oct 2012 13:34:20 +0000 (16:34 +0300)]
fix TYPO
Valeriy Sizov [Tue, 2 Oct 2012 13:29:03 +0000 (16:29 +0300)]
Update linguist and pygments #1602
Dmitriy Zaporozhets [Tue, 2 Oct 2012 12:05:28 +0000 (12:05 +0000)]
Merge branch 'api_for_user_creation' of dev.gitlabhq.com:gitlabhq
Valeriy Sizov [Tue, 2 Oct 2012 10:59:22 +0000 (13:59 +0300)]
#1585 Api for user creation: rspec
Valeriy Sizov [Tue, 2 Oct 2012 09:52:13 +0000 (12:52 +0300)]
#1585 Api for user creation: create help
Valeriy Sizov [Tue, 2 Oct 2012 09:46:01 +0000 (12:46 +0300)]
#1585 Api for user creation: base implementation
Nihad Abbasov [Tue, 2 Oct 2012 09:32:59 +0000 (15:32 +0600)]
actually fix the build
Nihad Abbasov [Tue, 2 Oct 2012 09:27:21 +0000 (15:27 +0600)]
fix build
Dmitriy Zaporozhets [Tue, 2 Oct 2012 07:26:24 +0000 (10:26 +0300)]
Use class instead id for css styles
Dmitriy Zaporozhets [Mon, 1 Oct 2012 13:58:13 +0000 (16:58 +0300)]
Refactoring event views
Dmitriy Zaporozhets [Mon, 1 Oct 2012 13:39:19 +0000 (16:39 +0300)]
Refactored events output. Added links to authors of events
Valeriy Sizov [Mon, 1 Oct 2012 12:33:25 +0000 (15:33 +0300)]
remove unnecessary step from install guide
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
Riyad Preukschas [Sun, 30 Sep 2012 10:07:45 +0000 (12:07 +0200)]
Fix completion for per line forms
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
Cyril [Sat, 29 Sep 2012 11:01:13 +0000 (13:01 +0200)]
all devise controller use devise layout
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")
Dmitriy Zaporozhets [Fri, 28 Sep 2012 13:05:54 +0000 (16:05 +0300)]
commit show page styled a bit
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.
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
randx [Thu, 27 Sep 2012 20:59:41 +0000 (23:59 +0300)]
blue hover
randx [Thu, 27 Sep 2012 20:52:08 +0000 (23:52 +0300)]
Move ProjectHooks from spec/requests to spinach
randx [Thu, 27 Sep 2012 20:23:11 +0000 (23:23 +0300)]
tests for: Profile -> History
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
Cyril [Thu, 27 Sep 2012 18:59:42 +0000 (20:59 +0200)]
rename ProjectController to ProjectResourceController
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
Robert Speicher [Thu, 27 Sep 2012 17:12:11 +0000 (13:12 -0400)]
Minor doc fix
randx [Thu, 27 Sep 2012 16:38:52 +0000 (19:38 +0300)]
Fix back button for tree navigation
randx [Thu, 27 Sep 2012 14:13:26 +0000 (17:13 +0300)]
Dont show compare link if only one commit in push
Dmitriy Zaporozhets [Thu, 27 Sep 2012 14:06:36 +0000 (07:06 -0700)]
Merge pull request #1570 from NARKOZ/refactoring
models cleanup
randx [Thu, 27 Sep 2012 14:00:13 +0000 (17:00 +0300)]
gitolite-client fork replaced with origin gem
Cyril [Thu, 27 Sep 2012 11:44:53 +0000 (13:44 +0200)]
update new controllers
Cyril [Thu, 27 Sep 2012 10:25:52 +0000 (12:25 +0200)]
Merge branch 'master' into simplify_controllers2
Conflicts:
app/controllers/commits_controller.rb
app/controllers/refs_controller.rb
Nihad Abbasov [Thu, 27 Sep 2012 06:36:55 +0000 (23:36 -0700)]
cleanup database.yml files
Nihad Abbasov [Thu, 27 Sep 2012 06:32:04 +0000 (23:32 -0700)]
replace ^ and $ anchors in regexp with \A and \z respectively
http://guides.rubyonrails.org/security.html#regular-expressions
Nihad Abbasov [Thu, 27 Sep 2012 06:28:10 +0000 (23:28 -0700)]
.map -> .pluck
Nihad Abbasov [Thu, 27 Sep 2012 06:20:36 +0000 (23:20 -0700)]
cosmetical cleanup of models
Nihad Abbasov [Thu, 27 Sep 2012 05:36:31 +0000 (22:36 -0700)]
annotate models
Dmitriy Zaporozhets [Thu, 27 Sep 2012 08:58:41 +0000 (11:58 +0300)]
Fix blame markup & breadcrubs for commits
Dmitriy Zaporozhets [Thu, 27 Sep 2012 06:56:02 +0000 (09:56 +0300)]
Merge branch 'tsigo-routing_overhaul'
Dmitriy Zaporozhets [Thu, 27 Sep 2012 06:53:42 +0000 (09:53 +0300)]
Fixed ref switcher
Dmitriy Zaporozhets [Thu, 27 Sep 2012 06:49:00 +0000 (09:49 +0300)]
Fixed updir method. Fixed breadcrumbs for commits
Robert Speicher [Wed, 26 Sep 2012 21:00:52 +0000 (17:00 -0400)]
Remove app_menu and project_menu partials
Now it's consistent across layouts where their main menus are.
Robert Speicher [Wed, 26 Sep 2012 20:45:00 +0000 (16:45 -0400)]
Routes are now final
Robert Speicher [Wed, 26 Sep 2012 20:14:17 +0000 (16:14 -0400)]
Replace various "active tab" checks with nav_link
Also remove now-unused tab_class helper
Robert Speicher [Wed, 26 Sep 2012 20:13:23 +0000 (16:13 -0400)]
Add nav_link helper to TabHelper
Robert Speicher [Wed, 26 Sep 2012 19:06:07 +0000 (15:06 -0400)]
Add current_action? helper
Robert Speicher [Wed, 26 Sep 2012 18:52:01 +0000 (14:52 -0400)]
Use Rails.root.join where appropriate