Commit graph

3834 commits

Author SHA1 Message Date
Riyad Preukschas
cfca11f2bc Merge pull request #2423 from hopson/master
Spelling error in merge request email
2012-12-28 14:44:55 -08:00
Robert Hopson
32be082055 Update app/views/notify/new_merge_request_email.html.haml
Fix spelling of 'assignee'
2012-12-28 10:56:48 -08:00
Chris Frohoff
21e55ca318 added RAILS_RELATIVE_URL_ROOT support 2012-12-28 18:11:28 +00:00
Koen Punt
b822efb9d1 Remove wget dependency, now all curl 2012-12-28 13:38:43 +01:00
Dmitriy Zaporozhets
e9394c48ca Fix dir_exists? 2012-12-28 06:24:05 +03:00
Dmitriy Zaporozhets
d03964d6ec Fixed and improved enable_naamespace migration task 2012-12-28 06:14:05 +03:00
Dmitriy Zaporozhets
d991ce636b Merge pull request #2390 from simi/master
No need to install custom phantomjs for travis.
2012-12-28 01:02:43 -08:00
Dmitriy Zaporozhets
1f3bdd453e Allow spaces in project name 2012-12-28 09:29:57 +02:00
Dmitriy Zaporozhets
3de4271846 Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298 2012-12-28 09:14:28 +02:00
Dmitriy Zaporozhets
c29457a396 Merge pull request #2394 from troyanov/master
fix warning 'nohup: redirecting stderr to stdout' for resque.sh
2012-12-27 06:59:52 -08:00
Dmitriy Zaporozhets
4cbb29cfad Fix not_in_project scope. Added counters in admin -> users. Improved seeds 2012-12-27 06:14:05 +03:00
Dmitriy Zaporozhets
e56a47ab19 Dev fixtures: Add sample ssh key to admin 2012-12-27 12:13:18 +02:00
Dmitriy Zaporozhets
dae56806df Merge pull request #2386 from cvut/fix-passenger
Fix shared Redis connection issue on Passenger
2012-12-27 01:23:17 -08:00
Andrey Kumanyaev
655b836b2a test reanimated 2012-12-26 20:31:47 +04:00
Andrey Kumanyaev
c8bf5905bf Fix form url and routes path 2012-12-26 20:31:18 +04:00
Andrey Kumanyaev
98044f0f14 Code duplication removed from controllers 2012-12-26 20:30:11 +04:00
Andrey Kumanyaev
39e7a0eafe Rewrite rendering rows with users projects access in Users table in Admin group section 2012-12-26 19:52:16 +04:00
Andrey Kumanyaev
634783feb0 Rename scope "in_group" to "in_namespace" 2012-12-26 19:52:16 +04:00
Andrey Kumanyaev
1e3d238910 Replace short loop variable from "p" to "project" 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
2753cea75a Add variable form in user section 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
25c5763780 Add functional in user section 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
9c574464a6 Add functional in admin section 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
17ea019f4e Add Project name validation 2012-12-26 19:52:15 +04:00
Valeriy Sizov
c4536ae587 Merge pull request #2376 from sriharshav/fixed
Fix replace return with next in rake rask
2012-12-26 05:02:56 -08:00
anton troyanov
a934bafd9f fix warning 'nohup: redirecting stderr to stdout'
related issue https://github.com/gitlabhq/gitlabhq/issues/2045
2012-12-26 16:36:40 +04:00
Riyad Preukschas
70ebcf250a Merge pull request #2381 from Razer6/update-develop-guide
Fixed broken link to developer guide, fixes #2380
2012-12-26 03:15:10 -08:00
Riyad Preukschas
d803eed264 Merge pull request #2378 from PaulWagener/patch-1
Update doc/install/installation.md
2012-12-26 03:12:07 -08:00
Dmitriy Zaporozhets
5cd823847b Use gitlab resque fork. Added rake task to stop all workers 2012-12-26 11:23:43 +02:00
Dmitriy Zaporozhets
3b1519da47 Merge pull request #2388 from zzet/feature/add_errors_henlder_into_dev
Better support for error handling in dev environment
2012-12-26 00:55:08 -08:00
Josef Šimánek
103bb239e5 Update .travis.yml 2012-12-26 00:29:28 +01:00
Andrey Kumanyaev
9ff1ec7d8e Added gems better_errors and binding_of_caller 2012-12-26 02:42:53 +04:00
Jakub Jirutka
a1434ff50b Fix shared Redis connection issue on Passenger 2012-12-25 23:14:00 +01:00
Dmitriy Zaporozhets
4c800342af Fix routing by priority 2012-12-25 16:24:44 +02:00
Dmitriy Zaporozhets
3c1022f9b1 No resque errors 2012-12-25 16:18:22 +02:00
Robert Schilling
1be3941f7d Fixed broken link to developer guide, fixes #2380 2012-12-25 15:04:58 +01:00
Dmitriy Zaporozhets
64db738f9d Trying to fix resque issue 2012-12-25 15:53:50 +02:00
PaulWagener
80f75b8174 Update doc/install/installation.md
'th -> the' typo
2012-12-25 12:25:44 +01:00
Sriharsha Vardhan
d41aac629b Fix replace return with next in rake rask 2012-12-25 12:13:50 +05:30
Dmitriy Zaporozhets
c5eba169cd Cleanup service tasks 2012-12-25 07:14:05 +03:00
Dmitriy Zaporozhets
c8ba5c2d58 Fix routing issues when navigating over tree, commits etc 2012-12-25 06:14:05 +03:00
Dmitriy Zaporozhets
49e73f8ac1 Fixed syntax error in config -> settings 2012-12-24 21:29:53 +02:00
Dmitriy Zaporozhets
6570843f84 Fix MR count for group scope 2012-12-24 21:27:12 +02:00
Dmitriy Zaporozhets
0dbb369ace Cleanup deprecated configs 2012-12-24 21:25:33 +02:00
Dmitriy Zaporozhets
8419740778 Starting 4.1.0pre 2012-12-24 21:24:53 +02:00
Dmitriy Zaporozhets
4ba24596d3 Make the logo icon more awesome 2012-12-24 21:18:23 +02:00
Dmitriy Zaporozhets
a87fccc083 Update projects in gitolite after namespace moved. Added rake task to cleanup garbage from gitolite 2012-12-24 20:02:08 +02:00
Riyad Preukschas
dea8628171 Merge branch 'stable' 2012-12-24 16:48:32 +01:00
Riyad Preukschas
8ef7b9b6d1 Make SQLite check in gitlab:check more robust 2012-12-24 16:45:10 +01:00
Riyad Preukschas
0e15270b75 Fix crash in gitlab:check while checking hooks 2012-12-24 16:45:08 +01:00
Riyad Preukschas
d9ca1bce7a Fix paths in gitlab:check 2012-12-24 16:45:03 +01:00