Commit graph

4073 commits

Author SHA1 Message Date
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
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
Sebastian Ziebell 40e7846f3e Status code 404 returned when retrieving non existent branch (issue #2922)
Accessing a repository branch that does not exist returns a 404 error instead
of 200 now. Added a test.
2013-02-08 17:04:08 +01:00
Dmitriy Zaporozhets 2f0a75ab77 GitLab meta to 5.0 2013-02-08 08:55:39 +02:00
Dmitriy Zaporozhets 4b58030207 Merge pull request #2936 from jameswritescode/fix_installation_doc_typo
fix the gitlab-shell clone url in master installation doc
2013-02-07 22:41:19 -08:00
James Newton d4c24b990f fix the gitlab-shell clone url 2013-02-07 11:53:37 -06:00
Dmitriy Zaporozhets 66121d6caa Improve devise views 2013-02-07 13:20:33 +02:00
Dmitriy Zaporozhets 210e9cd489 It should be 5.0.0pre 2013-02-07 13:05:30 +02:00
Dmitriy Zaporozhets 4e1757bfda Merge branch 'gitlab-shell' of dev.gitlabhq.com:gitlab/gitlabhq 2013-02-07 08:26:39 +00:00
Dmitriy Zaporozhets d09d87e3b0 fix deploy key spec 2013-02-07 10:25:47 +02:00
Dmitriy Zaporozhets cdcf69d0d9 gitlab;shell init script 2013-02-07 10:06:39 +02:00
Dmitriy Zaporozhets 8ae1d812dc deploy keys support for gitlab-shell api 2013-02-07 09:56:13 +02:00
Dmitriy Zaporozhets 48628d31d5 dont allow duplicates in ssh keys 2013-02-07 09:42:22 +02:00
Jon Evans 6474797d1c Update app/views/admin/users/_form.html.haml 2013-02-06 09:27:09 -05:00
Jon Evans c9777518e3 Ruby 1.9 hash syntax 2013-02-06 09:26:46 -05:00
Jon Evans 4ce3ef41de Disable autocomplete for admin/users form
Fixes #2796
2013-02-06 08:50:35 -05:00
Marin Jankovski 1b4ba3eb99 Add user delete option. 2013-02-06 12:44:09 +01:00
Dmitriy Zaporozhets 4bfb98ddc9 Merge pull request #2877 from former03/feature_groups_api
Add groups api
2013-02-06 03:19:29 -08:00