Andrew Kulakov
303fb06c96
Event already has author relation
2013-02-19 15:22:29 +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
bfc359ca61
Fix project filter for MR on dashboard
2013-02-19 09:43:41 +02:00
Dmitriy Zaporozhets
a29db26cc9
Refactor and restyle team page for project
2013-02-18 21:10:49 +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
ea28519f57
Merge pull request #2996 from raphendyr/ssh_fingerprint_fix
...
Ssh fingerprint fix
2013-02-18 09:56:35 -08:00
Andrew8xx8
d27ed43daa
Hash syntax improved
2013-02-18 17:22:18 +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
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
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
Fumiya Nakamura
20868acc96
Fix file_path to correspond with the name
2013-02-15 05:50:42 -08:00
Fumiya Nakamura
a1d106110d
Fix file_name for archive
2013-02-15 05:00:15 -08:00
Jaakko Kantojärvi
6fd88b8cbb
Fix ssh key fingerprinting test to use exitcode
2013-02-15 11:16:21 +02:00
Dmitriy Zaporozhets
f9dd547aa7
remove commented code
2013-02-15 09:16:46 +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
Pierre Gambarotto
b6b6b640b1
fix archive download : not creating namespace directory
2013-02-14 14:29:24 +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
Andrew8xx8
839957cf56
Constants in Events looks good now
2013-02-13 15:48:16 +04:00
Dmitriy Zaporozhets
806b76a168
rename scope to prevent name collision
2013-02-12 11:46:50 +02:00
Andrew8xx8
b5db541338
All scopes must be in lambdas
2013-02-12 11:16:45 +04: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
d64090b8a9
No gitolite in project any more
2013-02-11 19:16:59 +02:00
Dmitriy Zaporozhets
fcfb6d8438
Since gitlab-shell no sense to check hooks
2013-02-11 09:15:42 +02:00
Dmitriy Zaporozhets
48628d31d5
dont allow duplicates in ssh keys
2013-02-07 09:42:22 +02:00
Dmitriy Zaporozhets
478570dc32
fix move repository
2013-02-05 13:43:25 +02:00
Dmitriy Zaporozhets
39e37677f2
add remove keys from gitlab-shell by id
2013-02-05 11:12:15 +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
193a5624b2
add path and path_with_namespace to api project entity
2013-01-31 09:11:35 +02:00
Dmitriy Zaporozhets
560985b0f6
Fixed link_to_member
2013-01-30 17:07:44 +02:00
Dmitriy Zaporozhets
8b54b7233e
Async perform for add/remove team members
2013-01-28 17:39:02 +02:00
Dmitriy Zaporozhets
1c5876eb7b
Do gitolite calls async. Remove satellite with project remove
2013-01-28 17:22:45 +02:00
Dmitriy Zaporozhets
552e42f634
Merge pull request #2768 from rlaneve/feature/queued-web-hooks
...
Updates web hooks to process via queue
2013-01-27 08:52:37 -08:00
Andrey Kumanyaev
916165dfc4
username is default param to User
2013-01-25 22:35:58 +04:00
Ryan LaNeve
8a65229b35
Updates project to process web hooks async via sidekiq.
...
A new queue of "project_web_hook" is used to process web hooks asynchronously, allowing each to succeed/fail (and be retried) independently.
(Basically, project web hooks now process the same as system hooks.)
2013-01-25 10:42:57 -05:00
Dmitriy Zaporozhets
74e329064a
teams refactoring and cleanup pt.1
2013-01-25 16:36:14 +02:00
Dmitriy Zaporozhets
6350b32a3d
Fix security issues with teams
2013-01-25 15:51:45 +02:00
Dmitriy Zaporozhets
3ddd9f753c
Fix mass-assignment. Dont allow users w/o access to create team
2013-01-25 15:42:41 +02:00
Dmitriy Zaporozhets
70e05801b1
fix User.potential_team_members
2013-01-25 15:36:10 +02:00
Dmitriy Zaporozhets
00e4a479d3
allow/deny user to create group/team
2013-01-25 11:30:49 +02:00
Andrey Kumanyaev
d839f6c525
Remove simple code duplication in members controllers
2013-01-24 22:31:49 +02:00