Commit graph

218 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
c4299bb45a Move directory logic out of model. Use Gitlab:Shell class to interact with file system 2013-03-21 22:11:08 +02:00
Dmitriy Zaporozhets
0103363191 replace Gitolited mixin with Gitlab::ShellAdapter 2013-03-21 21:01:14 +02:00
Dmitriy Zaporozhets
316cf61965 Merge pull request #3247 from Undev/feature/fix_bug_in_team_assigment
Fix bug with downgrade permissions on first project assigment to team
2013-03-20 00:35:24 -07:00
Martin Bastien
397c3da975 Fix user path in markdown 2013-03-19 21:29:59 -03:00
Andrey Kumanyaev
0f39610532 Add control of action in project to team assigment 2013-03-18 16:07:04 +04:00
Andrey Kumanyaev
a0f2fbc250 Fix bug with downgrade permissions on first project assigment to team 2013-03-18 15:44:26 +04:00
Dmitriy Zaporozhets
3513902396 Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests
Fix failure of cheking a merge request after conflict.
2013-03-18 03:39:51 -07:00
Kevin Lyda
415bade302 Result of misspellings run.
Most of these are comments but a few are strings for users.

Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check

It runs mostly clean now.
2013-03-17 19:46:54 +00:00
murank
77295b00b8 Fix the order of clearing a satellite 2013-03-17 23:50:20 +09:00
Dmitriy Zaporozhets
59b36f2032 Use gitlab-shell to move repos. Requires gitlab-shell v1.1.0 2013-03-12 12:37:53 +02:00
Dmitriy Zaporozhets
f22488f726 Merge pull request #3143 from Undev/state-machine-3
State machine 3
2013-03-05 05:38:16 -08:00
Dmitriy Zaporozhets
3a09f02e11 Merge pull request #3109 from hiroponz/improve-network-graph
Improve network graph
2013-03-04 23:02:27 -08:00
Andrew8xx8
0d9a6fe7b1 User's blocked field refactored to use state machine 2013-03-04 18:52:30 +04:00
Andrew8xx8
9e8a818696 Issues helper included to markdown helper 2013-02-28 16:11:13 +04:00
Andrew8xx8
68a7ecdaaf Project issue tracker functions refactored 2013-02-28 16:10:00 +04:00
Andrew8xx8
e6d2e56961 Issue tracker field added to projects 2013-02-28 16:10:00 +04:00
Sato Hiroyuki
d8a40d8c93 Move graph module from lib or vendor directory to app directory.
Because not autoloading lib directory at development mode.
2013-02-26 20:31:39 +09: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
Bhagavan Das
4bc7d98d65 Remove hardcoded refernce to gitlab-shell home. so that gitlab can be installed on any unix account other than git 2013-02-14 23:10:18 +00:00
Dmitriy Zaporozhets
c9ca15e8d6 require missing lib 2013-02-14 15:25:55 +02:00
Dmitriy Zaporozhets
49cf9badbc Gitlab::ShellEnv added 2013-02-14 15:17:43 +02:00
Dmitriy Zaporozhets
b698094d4d Update post-receive worker to use correct identifier 2013-02-14 14:00:02 +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
2a1fac9e4f add import repo gitlab_shell call 2013-02-11 19:41:02 +02:00
Dmitriy Zaporozhets
d64090b8a9 No gitolite in project any more 2013-02-11 19:16:59 +02:00
Sato Hiroyuki
9dccecc9b5 Sort the commits on network graph by commiter date.
Author date is not updated, if the commits is rebased.
So the network graph having many rebased commit turns round and round,
that it is very difficult to undarstand history.
2013-02-05 19:58:49 +09:00
Sato Hiroyuki
df85c9c06a Fix bug when it has been switched to tag. 2013-02-05 19:08:25 +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
7812cb77c8 Fix typo. 2013-02-05 12:20:04 +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
27d9ac0fe8 Make gitlab works with gitlab-shell 2013-02-04 15:07:56 +02:00
Dmitriy Zaporozhets
6b9a609044 preparing for gitlab-shell 2013-02-04 14:28:10 +02:00
Sato Hiroyuki
4133221200 Fix bug of network graph(#2847) and trivial code clean up. 2013-01-31 17:48:51 +09:00
Dmitriy Zaporozhets
d46cb3fd1c Merge pull request #2847 from hiroponz/improve-overlap-lines
Improve overlap of lines in network graph
2013-01-30 22:22:37 -08:00
Sato Hiroyuki
59b6de93ce Improve overlap of lines in network graph 2013-01-30 23:48:00 +09:00
Sato Hiroyuki
525a8cd3e9 Switchable the main branch on network graph 2013-01-30 09:12:03 +09:00
Dmitriy Zaporozhets
c84675ee06 satellites logs 2013-01-29 12:12:24 +02:00
Dmitriy Zaporozhets
299a9a1040 keys to gitolite via sidekiq now 2013-01-28 21:02:10 +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
639b0a8715 refactor add to team 2013-01-25 17:26:00 +02:00
Dmitriy Zaporozhets
5f3df89c64 Fix teams + gitolite access 2013-01-25 17:18:27 +02:00
Dmitriy Zaporozhets
2812e6f1f5 Fix removeing project if repo not exists 2013-01-25 13:47:54 +02:00
Andrey Kumanyaev
b7470440ff Move team project management to own controller 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
9804b7df68 Move admin team members management to own controller 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
360aa1b407 Team core management 2013-01-24 22:31:24 +02:00
Sato Hiroyuki
70687cd581 Improve network graph 2013-01-23 21:39:29 +09:00
Dmitriy Zaporozhets
d770714578 Use subproccess instead subshell for git calls 2013-01-22 10:35:58 +02:00