Dmitriy Zaporozhets
|
5d72a3e133
|
Merge branch 'Undev-state-machine'
|
2013-02-19 11:04:54 +02: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 |
|
Andrew8xx8
|
6e333d5075
|
Javascript widget fixed
|
2013-02-19 12:57:09 +04:00 |
|
|
Dmitriy Zaporozhets
|
52028dcd2d
|
Merge pull request #3013 from crystax/master
Sort groups alphabetically on dashboard page
|
2013-02-19 00:51:08 -08:00 |
|
|
Dmitriy Zaporozhets
|
bfc359ca61
|
Fix project filter for MR on dashboard
|
2013-02-19 09:43:41 +02:00 |
|
|
Andrew8xx8
|
d58eb62d68
|
Migrations iproved
|
2013-02-19 11:32:10 +04:00 |
|
Dmitry Moskalchuk
|
f7ae1bce25
|
Syntax fix of sorting groups/users
|
2013-02-19 11:13:19 +04: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
|
655e68a0ad
|
Merge pull request #2998 from axilleas/master
Minor changes to installation and databases docs.
|
2013-02-18 10:02:32 -08:00 |
|
|
Dmitriy Zaporozhets
|
b87ef427e9
|
Merge pull request #2990 from raphendyr/gitignore_and_logrotate
Change .gitignore to ignore logrotated log files.
|
2013-02-18 10:01:09 -08: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
|
ea28519f57
|
Merge pull request #2996 from raphendyr/ssh_fingerprint_fix
Ssh fingerprint fix
|
2013-02-18 09:56:35 -08:00 |
|
|
Andrew8xx8
|
e5f048f44d
|
Migrations refactored ro support data convertion
|
2013-02-18 18:54:30 +04:00 |
|
|
Dmitriy Zaporozhets
|
97de6f851b
|
Fix not-working team memebership permissions change
|
2013-02-18 16:40:11 +02:00 |
|
|
Andrew8xx8
|
41e97a766b
|
Creating test values moved to before
|
2013-02-18 17:52:39 +04:00 |
|
|
Andrew8xx8
|
d27ed43daa
|
Hash syntax improved
|
2013-02-18 17:22:18 +04: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 |
|
|
Andrew8xx8
|
231d9e0426
|
Observer refactored to use StateMachine events
|
2013-02-18 16:49:17 +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
|
69698aacbc
|
Additional tests added to Issue
|
2013-02-18 14:43:50 +04:00 |
|
|
Andrew8xx8
|
b607c70e8f
|
Additional tests added to Milestone
|
2013-02-18 14:43:50 +04:00 |
|
|
Andrew8xx8
|
0b4f4fe157
|
Migrations for StateMachine refactoring added
|
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
|
29f70acc98
|
Merge Request 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
|
f97296597c
|
Issuable consern uses StateMachine now
|
2013-02-18 14:43:49 +04:00 |
|
|
Andrew8xx8
|
8db3920c01
|
State renamed to merge_status
|
2013-02-18 14:43:49 +04:00 |
|
|
Andrew8xx8
|
26d4574ada
|
State machine gem added
|
2013-02-18 14:43:49 +04:00 |
|
|
Dmitriy Zaporozhets
|
020078663e
|
Prevent xss attack over group name. Added regex validation for group and team name
|
2013-02-18 09:28:18 +02:00 |
|
Jaakko Kantojärvi
|
c20be05a80
|
Fix ssh key test by adding valid ssh key
|
2013-02-17 21:31:48 +02:00 |
|
|
Jaakko Kantojärvi
|
27f4cf7542
|
Tests to validate that invalid keys are rejected
|
2013-02-17 21:31:20 +02:00 |
|
|
Dmitriy Zaporozhets
|
cfdf94fc27
|
use attachment secure_url for Attachemnt page
|
2013-02-17 16:18:42 +02:00 |
|
|
Dmitriy Zaporozhets
|
0d3b75845a
|
Merge pull request #3017 from jojosch/owner-link-admin
Fix link to owner of group and team in admin interface
|
2013-02-17 06:15:33 -08:00 |
|
|
Dmitriy Zaporozhets
|
1efeb1b562
|
redesign mars theme a bit. Better border color for search-input for dark theme
|
2013-02-17 12:16:19 +02:00 |
|
|
Dmitriy Zaporozhets
|
32a5548c41
|
Fix link color for dark theme
|
2013-02-17 12:05:26 +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
|
42ffbea8e0
|
Fix logo alignment for default theme
|
2013-02-16 21:37:06 +02:00 |
|
|
Dmitriy Zaporozhets
|
f45f033199
|
Add logo to deploy.html
|
2013-02-16 21:35:11 +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 |
|
|
Dmitry Moskalchuk
|
a9c1b85e08
|
Sort groups/namespaces by human name
|
2013-02-16 19:40:33 +04:00 |
|
|
Dmitry Moskalchuk
|
2a4ef0fe49
|
Sort groups alphabetically on dashboard page
|
2013-02-16 19:11:36 +04:00 |
|
|
Dmitriy Zaporozhets
|
fa3cc1dd24
|
Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq
|
2013-02-16 12:45:20 +00:00 |
|