deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3146 commits 6 branches 43 tags 25 MiB
Commit graph

3146 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets 339555846e Merge branch 'api_for_user_creation' of dev.gitlabhq.com:gitlabhq 2012-10-02 12:05:28 +00:00
Riyad Preukschas 93bc1ff108 Merge branch 'master' into fix-messages-for-deleted-things 2012-10-02 14:04:34 +02:00
Valeriy Sizov bda0a75581 #1585 Api for user creation: rspec 2012-10-02 13:59:22 +03:00
Valeriy Sizov 705e9f402e #1585 Api for user creation: create help 2012-10-02 12:52:13 +03:00
Valeriy Sizov 825081174a #1585 Api for user creation: base implementation 2012-10-02 12:46:01 +03:00
Nihad Abbasov 0187ae4e86 actually fix the build 2012-10-02 15:32:59 +06:00
Nihad Abbasov 025d5e68c8 fix build 2012-10-02 15:27:21 +06:00
Dmitriy Zaporozhets b82cb2630c Use class instead id for css styles 2012-10-02 10:26:24 +03:00
Dmitriy Zaporozhets 69751aac32 Refactoring event views 2012-10-01 16:58:13 +03:00
Dmitriy Zaporozhets 663dd6fad6 Refactored events output. Added links to authors of events 2012-10-01 16:39:19 +03:00
Valeriy Sizov 433387be35 remove unnecessary step from install guide 2012-10-01 15:33:25 +03:00
Dmitriy Zaporozhets 5c8177ea6a Merge pull request #1594 from riyad/fix-completion-for-per-line-forms 
Fix completion for per line forms
 2012-09-30 08:15:09 -07:00
Riyad Preukschas 2022ae69df Clarify deletion messages 2012-09-30 15:04:43 +02:00
Riyad Preukschas f5a62835bb Fix completion for per line forms 2012-09-30 12:07:45 +02:00
Riyad Preukschas 6135eeaa3e Don't link to removed ref 2012-09-30 00:53:21 +02:00
Riyad Preukschas c2303737ba Fix double ref_type in push event when removing branch or tag 2012-09-30 00:53:04 +02:00
Valeriy Sizov 3bcc39b4d3 Merge pull request #1590 from thomwiggers/patch-1 
fixed some grammar stuff
 2012-09-29 05:55:43 -07:00
Cyril 236fd1e63b all devise controller use devise layout 2012-09-29 13:06:53 +02:00
Thom Wiggers b17bbb238d fixed some grammar stuff 
Fixed a few things (wont -> won't, "a code")
 2012-09-29 02:36:06 +03:00
Dmitriy Zaporozhets a79eb84289 commit show page styled a bit 2012-09-28 16:05:54 +03:00
Dmitriy Zaporozhets 9d9493c8d8 Merge pull request #1582 from Kouno/nfs-fix 
Fix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment.
 2012-09-28 03:07:13 -07:00
Vincent Bonmalais 1fe45898d7 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
 2012-09-28 16:53:02 +10:00
randx 7ded8584a5 blue hover 2012-09-27 23:59:41 +03:00
randx db69836319 Move ProjectHooks from spec/requests to spinach 2012-09-27 23:52:08 +03:00
randx 9cabe04368 tests for: Profile -> History 2012-09-27 23:23:11 +03:00
Dmitriy Zaporozhets 68f4b59738 Merge pull request #1569 from jouve/simplify_controllers2 
Simplify controllers and layout handling
 2012-09-27 12:53:01 -07:00
Cyril be18397d82 rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
Dmitriy Zaporozhets 3e9836ae1e Merge pull request #1526 from namtzigla/dot-repos-names 
changed the post-receive hook in order to push the correct repository
 2012-09-27 10:22:33 -07:00
Robert Speicher 1502be325d Minor doc fix 2012-09-27 13:12:11 -04:00
randx 308dfc36b8 Fix back button for tree navigation 2012-09-27 19:38:52 +03:00
randx afecb250a4 Dont show compare link if only one commit in push 2012-09-27 17:13:26 +03:00
Dmitriy Zaporozhets e0d0c1b225 Merge pull request #1570 from NARKOZ/refactoring 
models cleanup
 2012-09-27 07:06:36 -07:00
randx 80bfd6a50b gitolite-client fork replaced with origin gem 2012-09-27 17:00:13 +03:00
Cyril 933c5e4146 update new controllers 2012-09-27 13:44:53 +02:00
Cyril e563e948bb Merge branch 'master' into simplify_controllers2 
Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb
 2012-09-27 12:25:52 +02:00
Nihad Abbasov a030e4b664 cleanup database.yml files 2012-09-27 02:56:20 -07:00
Nihad Abbasov 2088d2eba8 replace ^ and $ anchors in regexp with \A and \z respectively 
http://guides.rubyonrails.org/security.html#regular-expressions
 2012-09-27 02:56:20 -07:00
Nihad Abbasov c7a1779b22 .map -> .pluck 2012-09-27 02:55:57 -07:00
Nihad Abbasov 841e4fbd08 cosmetical cleanup of models 2012-09-27 02:05:53 -07:00
Nihad Abbasov 2a4359a572 annotate models 2012-09-27 02:05:53 -07:00
Dmitriy Zaporozhets a8870e87e4 Fix blame markup & breadcrubs for commits 2012-09-27 11:58:41 +03:00
Dmitriy Zaporozhets 19c58becc0 Merge branch 'tsigo-routing_overhaul' 2012-09-27 09:56:02 +03:00
Dmitriy Zaporozhets 2c8d3c33ff Fixed ref switcher 2012-09-27 09:53:42 +03:00
Dmitriy Zaporozhets beb324c1c6 Fixed updir method. Fixed breadcrumbs for commits 2012-09-27 09:49:00 +03:00
Robert Speicher d8f7748dea Remove app_menu and project_menu partials 
Now it's consistent across layouts where their main menus are.
 2012-09-26 17:00:52 -04:00
Robert Speicher 8432c9c176 Routes are now final 2012-09-26 16:45:00 -04:00
Robert Speicher 36f68140d1 Replace various "active tab" checks with nav_link 
Also remove now-unused tab_class helper
 2012-09-26 16:38:28 -04:00
Robert Speicher f064c84019 Add nav_link helper to TabHelper 2012-09-26 16:32:26 -04:00
Robert Speicher aa0c4b77b6 Add current_action? helper 2012-09-26 16:32:26 -04:00
Robert Speicher afc4a75499 Use Rails.root.join where appropriate 2012-09-26 16:32:26 -04:00