Sebastian Ziebell
c8b92a4be2
Merge branch 'master' into fixes/api
2013-02-14 17:02:16 +01:00
Sebastian Ziebell
6df02adc7a
API: status code 403 returned if new project would exceed limit
...
When the project limit is reached the user is not allowed to create new ones.
Instead of error code 404 the status code 403 (Forbidden) is returned with error
message via API.
2013-02-14 15:51:56 +01:00
Dmitriy Zaporozhets
ed3f44085e
Redesign Admin -> user -> show page
2013-02-13 19:14:35 +02:00
Dmitriy Zaporozhets
6b24c375cb
style admin -> users page. Search by username too
2013-02-13 17:28:28 +02:00
Dmitriy Zaporozhets
fd5dc597ed
Add placeholder for project import
2013-02-13 15:27:18 +02:00
Andrew8xx8
839957cf56
Constants in Events looks good now
2013-02-13 15:48:16 +04: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
Dmitriy Zaporozhets
06dd530ede
Merge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhq
2013-02-12 10:53:51 +00: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
Andrew8xx8
b5db541338
All scopes must be in lambdas
2013-02-12 11:16:45 +04:00
Dmitriy Zaporozhets
d138b3de4b
Render events for team dashboard
2013-02-11 23:23:38 +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
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
Dmitriy Zaporozhets
ab19196391
fix attachment uploader for aws
2013-02-11 10:14:32 +02:00
Dmitriy Zaporozhets
fcfb6d8438
Since gitlab-shell no sense to check hooks
2013-02-11 09:15:42 +02:00
Dmitriy Zaporozhets
ff76e05271
show project head for empty project
2013-02-09 15:16:33 +02:00
Dmitriy Zaporozhets
152f87864c
remove useless warning
2013-02-09 12:32:24 +02:00
Dmitriy Zaporozhets
66121d6caa
Improve devise views
2013-02-07 13:20:33 +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
478570dc32
fix move repository
2013-02-05 13:43:25 +02:00
Dmitriy Zaporozhets
70e3bffd95
Fixed: post-receive, project remove, tests
2013-02-05 12:47:50 +02:00
Sato Hiroyuki
8ff5cf9cd5
Add search box for the commit.
2013-02-05 19:08:09 +09:00
Dmitriy Zaporozhets
39e37677f2
add remove keys from gitlab-shell by id
2013-02-05 11:12:15 +02:00
Dmitriy Zaporozhets
081c272b85
Remove outdated specs and fixed key remove
2013-02-05 10:15:49 +02:00
Sato Hiroyuki
81cc1cb87b
Enable to display the commit older than 650th commit.
2013-02-05 12:42:30 +09:00
Sato Hiroyuki
1e907498a9
The commit is marked and displayed in the center.
2013-02-05 12:34:35 +09:00
Dmitriy Zaporozhets
6f7ccea668
Fix satellites to use filesystem. Correct post-receive user finder
2013-02-04 16:19:37 +02:00
Dmitriy Zaporozhets
896c3a0a9d
remove update_repository calls
2013-02-04 15:24:16 +02:00
Dmitriy Zaporozhets
27d9ac0fe8
Make gitlab works with gitlab-shell
2013-02-04 15:07:56 +02:00
Dmitriy Zaporozhets
85de55a120
Dont allow gitlab be loaded in iframe
2013-02-02 20:32:13 +02:00
Dmitriy Zaporozhets
0965aeb2ea
Fix crash on team update
2013-02-01 19:07:54 +02:00
Dmitriy Zaporozhets
e6002bdaff
Ability to manage and remove group as owner outside of admin area
2013-02-01 19:04:11 +02:00
Dmitriy Zaporozhets
591e094e06
Add a delay for sending emails
2013-02-01 17:04:41 +02:00
Dmitriy Zaporozhets
61833bcb74
fix app crash if author is missing
2013-02-01 09:33:12 +02:00
Dmitriy Zaporozhets
cc2484c3e6
Fix sending commit note email to id instead email
2013-02-01 08:59:30 +02:00
Dmitriy Zaporozhets
130f60d55b
a bit of restyling. Replace some images with icons. Simplify note form
2013-01-31 11:22:06 +02:00
Dmitriy Zaporozhets
193a5624b2
add path and path_with_namespace to api project entity
2013-01-31 09:11:35 +02:00