OSDN Git Service

wvm/gitlab.git
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 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 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 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

11 years agoMerge pull request #1570 from NARKOZ/refactoring
Dmitriy Zaporozhets [Thu, 27 Sep 2012 14:06:36 +0000 (07:06 -0700)]
Merge pull request #1570 from NARKOZ/refactoring

models cleanup

11 years agogitolite-client fork replaced with origin gem
randx [Thu, 27 Sep 2012 14:00:13 +0000 (17:00 +0300)]
gitolite-client fork replaced with origin gem

11 years agoupdate new controllers
Cyril [Thu, 27 Sep 2012 11:44:53 +0000 (13:44 +0200)]
update new controllers

11 years agoMerge branch 'master' into simplify_controllers2
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

11 years agocleanup database.yml files
Nihad Abbasov [Thu, 27 Sep 2012 06:36:55 +0000 (23:36 -0700)]
cleanup database.yml files

11 years agoreplace ^ and $ anchors in regexp with \A and \z respectively
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

11 years ago.map -> .pluck
Nihad Abbasov [Thu, 27 Sep 2012 06:28:10 +0000 (23:28 -0700)]
.map -> .pluck

11 years agocosmetical cleanup of models
Nihad Abbasov [Thu, 27 Sep 2012 06:20:36 +0000 (23:20 -0700)]
cosmetical cleanup of models

11 years agoannotate models
Nihad Abbasov [Thu, 27 Sep 2012 05:36:31 +0000 (22:36 -0700)]
annotate models

11 years agoFix blame markup & breadcrubs for commits
Dmitriy Zaporozhets [Thu, 27 Sep 2012 08:58:41 +0000 (11:58 +0300)]
Fix blame markup & breadcrubs for commits

11 years agoMerge branch 'tsigo-routing_overhaul'
Dmitriy Zaporozhets [Thu, 27 Sep 2012 06:56:02 +0000 (09:56 +0300)]
Merge branch 'tsigo-routing_overhaul'

11 years agoFixed ref switcher
Dmitriy Zaporozhets [Thu, 27 Sep 2012 06:53:42 +0000 (09:53 +0300)]
Fixed ref switcher

11 years agoFixed updir method. Fixed breadcrumbs for commits
Dmitriy Zaporozhets [Thu, 27 Sep 2012 06:49:00 +0000 (09:49 +0300)]
Fixed updir method. Fixed breadcrumbs for commits

11 years agoRemove app_menu and project_menu partials
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.

11 years agoRoutes are now final
Robert Speicher [Wed, 26 Sep 2012 20:45:00 +0000 (16:45 -0400)]
Routes are now final

11 years agoReplace various "active tab" checks with nav_link
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

11 years agoAdd nav_link helper to TabHelper
Robert Speicher [Wed, 26 Sep 2012 20:13:23 +0000 (16:13 -0400)]
Add nav_link helper to TabHelper

11 years agoAdd current_action? helper
Robert Speicher [Wed, 26 Sep 2012 19:06:07 +0000 (15:06 -0400)]
Add current_action? helper

11 years agoUse Rails.root.join where appropriate
Robert Speicher [Wed, 26 Sep 2012 18:52:01 +0000 (14:52 -0400)]
Use Rails.root.join where appropriate

11 years agoSpeed up Compare feature step
Robert Speicher [Wed, 26 Sep 2012 17:58:50 +0000 (13:58 -0400)]
Speed up Compare feature step

11 years agoSpeed up request specs a bit
Robert Speicher [Wed, 26 Sep 2012 17:43:42 +0000 (13:43 -0400)]
Speed up request specs a bit

11 years agoAdd branches and tags Repo methods
Robert Speicher [Wed, 26 Sep 2012 17:38:14 +0000 (13:38 -0400)]
Add branches and tags Repo methods

Simplifies the actions in RepositoriesController

11 years agoRename branches and tags Repo methods to branch_names and tag_names
Robert Speicher [Wed, 26 Sep 2012 17:34:51 +0000 (13:34 -0400)]
Rename branches and tags Repo methods to branch_names and tag_names

11 years agoRemove atom Dashboard spec that no longer applies
Robert Speicher [Wed, 26 Sep 2012 17:23:19 +0000 (13:23 -0400)]
Remove atom Dashboard spec that no longer applies

11 years agoClean up project access spec
Robert Speicher [Wed, 26 Sep 2012 17:22:30 +0000 (13:22 -0400)]
Clean up project access spec

11 years agoFix GFM request spec
Robert Speicher [Wed, 26 Sep 2012 17:21:55 +0000 (13:21 -0400)]
Fix GFM request spec

11 years agoFix Repository role spec
Robert Speicher [Wed, 26 Sep 2012 17:21:38 +0000 (13:21 -0400)]
Fix Repository role spec

11 years agoFix logs not showing in Tree for the root path
Robert Speicher [Wed, 26 Sep 2012 03:56:27 +0000 (23:56 -0400)]
Fix logs not showing in Tree for the root path

11 years agoAdd CommitsController spec to make sure atom feeds work
Robert Speicher [Wed, 26 Sep 2012 03:40:04 +0000 (23:40 -0400)]
Add CommitsController spec to make sure atom feeds work

11 years agoFix paths in commits/_head
Robert Speicher [Wed, 26 Sep 2012 03:39:50 +0000 (23:39 -0400)]
Fix paths in commits/_head

11 years agoUse current ref for Files and Commits if available
Robert Speicher [Wed, 26 Sep 2012 03:39:28 +0000 (23:39 -0400)]
Use current ref for Files and Commits if available

Closes #1452

11 years agoFix the remaining actions in RefsController
Robert Speicher [Wed, 26 Sep 2012 03:34:52 +0000 (23:34 -0400)]
Fix the remaining actions in RefsController

11 years agoRemove commit_tab_class helper
Robert Speicher [Wed, 26 Sep 2012 03:34:26 +0000 (23:34 -0400)]
Remove commit_tab_class helper

11 years agoFix various links
Robert Speicher [Wed, 26 Sep 2012 03:33:42 +0000 (23:33 -0400)]
Fix various links

11 years agoCompare views and cleanup
Robert Speicher [Wed, 26 Sep 2012 03:13:19 +0000 (23:13 -0400)]
Compare views and cleanup

- Remove compare/_head and just use commits/_head since they're identical
- Add index view; extract the form into a partial

11 years agoAdd Compare#index and Compare#create actions
Robert Speicher [Wed, 26 Sep 2012 03:10:50 +0000 (23:10 -0400)]
Add Compare#index and Compare#create actions

Create just redirects to our specially-formatted #show action

11 years agoUse current_controller? in layouts/_head partial
Robert Speicher [Wed, 26 Sep 2012 02:41:25 +0000 (22:41 -0400)]
Use current_controller? in layouts/_head partial

11 years agoAdd feature steps for a generic, non-"Shop" project
Robert Speicher [Wed, 26 Sep 2012 02:34:29 +0000 (22:34 -0400)]
Add feature steps for a generic, non-"Shop" project

This group is better for features that only deal with one project.

11 years agoUpdates to routing specs
Robert Speicher [Wed, 26 Sep 2012 02:32:54 +0000 (22:32 -0400)]
Updates to routing specs

11 years agoChange active tab and nav class to "active"
Robert Speicher [Wed, 26 Sep 2012 02:07:41 +0000 (22:07 -0400)]
Change active tab and nav class to "active"

The main nav used active, the sub nav used current. This normalizes it.

11 years agoMove tab_class helper to TabHelper
Robert Speicher [Wed, 26 Sep 2012 01:18:39 +0000 (21:18 -0400)]
Move tab_class helper to TabHelper

11 years agoAllow current_controller? helper to take an Array of options
Robert Speicher [Wed, 26 Sep 2012 01:18:00 +0000 (21:18 -0400)]
Allow current_controller? helper to take an Array of options

11 years agoAdd features for checking the "Active Tab" across various pages
Robert Speicher [Wed, 26 Sep 2012 00:11:57 +0000 (20:11 -0400)]
Add features for checking the "Active Tab" across various pages

11 years agoLimit commit history to 5 in Spinach
Robert Speicher [Wed, 26 Sep 2012 00:01:51 +0000 (20:01 -0400)]
Limit commit history to 5 in Spinach

Speeds things up a bit

11 years agoFix atom feed links
Robert Speicher [Tue, 25 Sep 2012 23:25:14 +0000 (19:25 -0400)]
Fix atom feed links

11 years agoAdd current_controller? helper method
Robert Speicher [Tue, 25 Sep 2012 23:22:44 +0000 (19:22 -0400)]
Add current_controller? helper method

Simplifies some of the "active tab" checks we're doing

11 years agoFix Refs#switch
Robert Speicher [Tue, 25 Sep 2012 23:17:54 +0000 (19:17 -0400)]
Fix Refs#switch