Sebastian Ziebell
375caeefcf
Merge branch 'master' into fixes/api
2013-02-13 10:31:06 +01:00
Sebastian Ziebell
ae40e855ef
API: test checks a 400 code is returned if snippet title not given
2013-02-13 10:29:42 +01:00
Sebastian Ziebell
82bd0904ff
API: test checks a 404 error is returned if snippet id not found
2013-02-13 10:25:13 +01:00
Dmitriy Zaporozhets
b9f8b40190
Merge pull request #2971 from yuters/patch-1
...
Some fix for gitlab:gitlab_shell:check
2013-02-12 22:17:24 -08:00
Martin Bastien
8353bd8ee3
Forgot gitlab-shell folder
2013-02-12 12:49:11 -05:00
Martin Bastien
6b96ca47e0
Some fix for gitlab:gitlab_shell:check
...
Fixing issue #2970
2013-02-12 12:42:36 -05:00
Dmitriy Zaporozhets
37a5ac4271
Merge pull request #2969 from zerustech/patch-1
...
Update lib/tasks/sidekiq.rake
2013-02-12 09:25:53 -08:00
Dmitriy Zaporozhets
8f9c01feed
Merge pull request #2946 from Asquera/fix/access_to_non_existent_branch
...
API: Fixes return code when accessing non existent branch (#2922 )
2013-02-12 09:24:54 -08:00
Dmitriy Zaporozhets
452adb7bcc
Merge branch 'hiroponz-easy-to-find-commit-on-network-graph'
2013-02-12 19:22:49 +02:00
Dmitriy Zaporozhets
622dae76cc
style network graph form a bit
2013-02-12 19:22:40 +02:00
Dmitriy Zaporozhets
ddea7d1689
Merge branch 'easy-to-find-commit-on-network-graph' of https://github.com/hiroponz/gitlabhq into hiroponz-easy-to-find-commit-on-network-graph
2013-02-12 19:02:05 +02:00
Dmitriy Zaporozhets
d6513b5153
Merge pull request #2924 from cdawzrd/patch-2
...
Disable autocomplete for admin/users form
2013-02-12 08:45:07 -08:00
Sebastian Ziebell
7cc4339f71
API: changed status codes for project hooks functions
...
Different status codes in the API lib are returned on hook creation, update or deletion.
If a required parameter is not given (e.g. `url` in `/projects/:id/hooks/:hook_id`) status
code 400 (Bad request) is returned. On hook deletion a 200 status code is returned, regardless if
the hook is present or not. This makes the DELETE function an idempotent operation. Appropriate tests
are added to check these status codes.
2013-02-12 17:44:42 +01:00
Michael Lee
4c0c908655
Update lib/tasks/sidekiq.rake
...
Mac OS uses launchd instead of /etc/init.d to start daemons and tasks to be started by launchd MUST NOT daemon itself. So "nohup" here won't work for Mac OS.
Can we add a "launchd" task to the rake file so that we can start sidekiq as "bundle exec rake sidekiq:launchd" ?
2013-02-12 23:01:55 +08:00
Dmitriy Zaporozhets
06dd530ede
Merge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhq
2013-02-12 10:53:51 +00:00
Dmitriy Zaporozhets
9f2041ad0e
Merge pull request #2965 from yurifury/fix-blob-route
...
Gitlab incorrectly routes blobs to the compare controller depending on filename.
2013-02-12 01:50:03 -08:00
Dmitriy Zaporozhets
bf908989d0
Merge branch 'Undev-fix-db-after-updating-rails'
2013-02-12 11:47:02 +02:00
Dmitriy Zaporozhets
806b76a168
rename scope to prevent name collision
2013-02-12 11:46:50 +02:00
Sebastian Ziebell
449380265a
Merge branch 'master' into fixes/api
2013-02-12 10:17:57 +01:00
Dmitriy Zaporozhets
4bf63212d7
Merge branch 'fix-db-after-updating-rails' of https://github.com/Undev/gitlabhq into Undev-fix-db-after-updating-rails
2013-02-12 11:13:25 +02:00
Dmitriy Zaporozhets
644f8819af
restore handling exception for project creation
2013-02-12 10:41:21 +02:00
Yuri Feldman
2d0c3e4c6d
Fix for incorrect routing to the Compare controller
2013-02-12 19:28:48 +11:00
Yuri Feldman
918e2213e7
Test to show incorrect routing to Compare controller
2013-02-12 19:28:37 +11:00
Andrew8xx8
b5db541338
All scopes must be in lambdas
2013-02-12 11:16:45 +04:00
Andrew8xx8
9a22ac63ec
Dynamic values must be in blocks if FG
2013-02-12 10:54:56 +04:00
Dmitriy Zaporozhets
d138b3de4b
Render events for team dashboard
2013-02-11 23:23:38 +02:00
Dmitriy Zaporozhets
06d9ccf484
Rails up to 3.2.12
2013-02-11 23:17:34 +02:00
Dmitriy Zaporozhets
68aa88c9bd
Fix project creation without import
2013-02-11 23:13:21 +02:00
Dmitriy Zaporozhets
8bf8c70c4b
Import repo feature
2013-02-11 23:00:12 +02:00
Dmitriy Zaporozhets
a699ebdbcc
handle attahcment with send_file
2013-02-11 21:31:19 +02:00
Dmitriy Zaporozhets
ab0cfc0036
fixing tests after refactoring
2013-02-11 20:28:27 +02:00
Dmitriy Zaporozhets
2a1fac9e4f
add import repo gitlab_shell call
2013-02-11 19:41:02 +02:00
Dmitriy Zaporozhets
ea0cb39d63
use proper name for gitlabshell worker
2013-02-11 19:27:26 +02:00
Dmitriy Zaporozhets
dd8d0a659d
Fix procfile and attachment in event nore
2013-02-11 19:25:06 +02:00
Dmitriy Zaporozhets
d64090b8a9
No gitolite in project any more
2013-02-11 19:16:59 +02:00
Dmitriy Zaporozhets
8e0b58d7e7
render note with attachment for event
2013-02-11 15:47:01 +02:00
Marin Jankovski
483f720861
UPdate field name.
2013-02-11 13:12:41 +01:00
Marin Jankovski
f339af858b
Test the delete acount option.
2013-02-11 13:06:37 +01:00
Dmitriy Zaporozhets
ab19196391
fix attachment uploader for aws
2013-02-11 10:14:32 +02:00
Dmitriy Zaporozhets
2d83e43db0
FIx gitlab:env:info
2013-02-11 10:02:52 +02:00
Dmitriy Zaporozhets
7a88bf0978
Fix gitlab:check
2013-02-11 09:58:02 +02:00
Dmitriy Zaporozhets
fcfb6d8438
Since gitlab-shell no sense to check hooks
2013-02-11 09:15:42 +02:00
Sebastian Ziebell
2bd955961c
Changed function to not_found.
...
Instead of using funtion `error!` the function `not_found!` is used to return 404 error. Adjusted documentation accordingly.
2013-02-09 21:01:17 +01:00
Dmitriy Zaporozhets
a404c43805
removing outdated checks
2013-02-09 15:34:04 +02:00
Dmitriy Zaporozhets
38737079b6
ignore docs by git
2013-02-09 15:26:47 +02:00
Dmitriy Zaporozhets
2f019b2b4c
cleanup rake tasks since no gitolite required
2013-02-09 15:21:19 +02:00
Dmitriy Zaporozhets
ff76e05271
show project head for empty project
2013-02-09 15:16:33 +02:00
Dmitriy Zaporozhets
38985390b0
Refactored and fixed seeds to work with gitlab-shell
2013-02-09 15:13:56 +02:00
Dmitriy Zaporozhets
152f87864c
remove useless warning
2013-02-09 12:32:24 +02:00
Dmitriy Zaporozhets
433f2dbcef
task to build missing projects with gitlab-shell
2013-02-09 12:30:49 +02:00
