Dmitriy Zaporozhets
d7b667fee2
Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2
...
Conflicts:
app/models/merge_request.rb
2013-02-26 10:38:40 +02:00
Dmitriy Zaporozhets
0cc95ef2f5
Merge pull request #2889 from kennytm/master
...
Show only ≤16 lines of codes in a discussion in a MR (issue #2860 ).
2013-02-26 00:32:02 -08:00
Dmitriy Zaporozhets
573942263a
Fix issue edit button showup
2013-02-26 10:17:09 +02:00
Dmitriy Zaporozhets
39fe9b644f
Add close issue to note actions bar
2013-02-25 23:10:50 +02:00
Dmitriy Zaporozhets
8de19b259e
proper name for issue partial
2013-02-25 22:56:10 +02:00
Dmitry Medvinsky
30180ed82e
Add title for "Remove from team" button
2013-02-22 20:29:03 +04:00
Dmitriy Zaporozhets
5aeaf248f1
Fixing rspec after upgrade to capybara pt1
2013-02-21 13:09:47 +02:00
Dmitriy Zaporozhets
42ce2c1080
improve selectors to pass capybara 2.0
2013-02-21 11:27:22 +02:00
Andrew8xx8
6d68923edc
human_merge_status replaced by human_merge_status_name
2013-02-20 17:50:29 +04:00
Andrew8xx8
e2d94e0719
State machine added for merge_status field
2013-02-20 17:49:48 +04:00
Dmitry Medvinsky
eb58529757
Add commit full time tooltip to commited_ago
2013-02-19 19:56:43 +04:00
Dmitriy Zaporozhets
155703c613
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
...
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
2013-02-19 11:01:19 +02:00
Dmitriy Zaporozhets
ba937b2b3d
Dont show assigned_teams block unless any. Show count in filter
2013-02-18 21:21:24 +02:00
Dmitriy Zaporozhets
a29db26cc9
Refactor and restyle team page for project
2013-02-18 21:10:49 +02:00
Dmitriy Zaporozhets
e9d8d074a1
no projects message in group area
2013-02-18 20:31:43 +02:00
Dmitriy Zaporozhets
e049e18780
Merge pull request #2991 from raphendyr/username_change_disablation
...
Add option to disable username changing
2013-02-18 09:59:24 -08:00
Dmitriy Zaporozhets
97de6f851b
Fix not-working team memebership permissions change
2013-02-18 16:40:11 +02:00
Andrew8xx8
557a9fa321
Debug remomved
2013-02-18 17:16:29 +04:00
Andrew8xx8
ff94f29be5
States events fixed
2013-02-18 16:49:56 +04:00
Dmitriy Zaporozhets
1481d1cfe0
Merge branch 'count_user_owned_projects' of /home/git/repositories/gitlab/gitlabhq
2013-02-18 12:46:45 +00:00
Dmitriy Zaporozhets
01a7250ba5
Add user to team he creates
2013-02-18 14:35:38 +02:00
Marin Jankovski
1734611181
Count owned projects, not just personal
2013-02-18 13:15:35 +01:00
Andrew8xx8
6074896cbf
Spinach tests fixed
2013-02-18 14:43:50 +04:00
Andrew8xx8
1644117a1a
Issue uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
0b512af803
Milestone uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
b45e9aefd3
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
8db3920c01
State renamed to merge_status
2013-02-18 14:43:49 +04:00
Dmitriy Zaporozhets
cfdf94fc27
use attachment secure_url for Attachemnt page
2013-02-17 16:18:42 +02:00
Johannes Schleifenbaum
3ae7a45d5a
Fix link to owner of group and team in admin interface
2013-02-17 11:00:02 +01:00
Dmitriy Zaporozhets
9764ba6df2
create satellite for imported repo
2013-02-16 21:47:43 +02:00
Dmitriy Zaporozhets
18a496142b
Reduce size of nav panel. Fixed nav background for IE. Refactored mars theme
2013-02-16 21:24:51 +02:00
Dmitriy Zaporozhets
fa3cc1dd24
Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq
2013-02-16 12:45:20 +00:00
Dmitriy Zaporozhets
b729728536
uppercase Gitlab version and revision constants. check api return gitlab version now
2013-02-16 14:42:22 +02:00
Jaakko Kantojärvi
ba65f2910b
Add option to disable username changing
...
This option allows to disable users from changing their username.
This is very usefull in environments using strong internal authentication methods like ldap, pam or shibboleth.
You can allow users to change theyr username in these environments, but then new users (users loging in first time) is blocked from gitlab is her username exists.
2013-02-14 17:58:56 +02: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
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
d138b3de4b
Render events for team dashboard
2013-02-11 23:23:38 +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
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
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
