deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4715 commits 6 branches 43 tags 25 MiB
Commit graph

4715 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets 8c9123943f Update changelog 2013-03-25 16:12:12 +02:00
Dmitriy Zaporozhets 795bb9cf65 Merge branch 'feature/login_with_username' 2013-03-25 16:10:30 +02:00
Dmitriy Zaporozhets 9d92433a7c login with both email or username 2013-03-25 16:10:14 +02:00
Dmitriy Zaporozhets 1496c01521 try to move wiki if it does not exist 2013-03-25 15:52:54 +02:00
Dmitriy Zaporozhets 6752968bb5 Updated changelog with transfer & security changes 2013-03-25 15:27:09 +02:00
Dmitriy Zaporozhets 6e78a1d7c8 Merge branch 'improve/project_transfer' 2013-03-25 15:20:42 +02:00
Dmitriy Zaporozhets 53e54ddf8a require gitlab-shell v1.2.0 now 2013-03-25 15:19:06 +02:00
Dmitriy Zaporozhets d6ac38133c Admin.projects: remove views and route specs 2013-03-25 14:58:43 +02:00
Dmitriy Zaporozhets 98bea4b1ff Updatev security tests since admin is a superuser now. Has access to any project 2013-03-25 13:40:08 +02:00
Dmitriy Zaporozhets c610347cc1 Removed not relevant tests for admin.projects 2013-03-25 13:36:08 +02:00
Dmitriy Zaporozhets d0df8a6ff8 remove project edit from admin area. Redesigned project page in admin area 2013-03-25 11:07:11 +02:00
Dmitriy Zaporozhets e292d7c17b Make transfer action in project controller 2013-03-25 10:48:30 +02:00
Dmitriy Zaporozhets ff35b37fd2 transfer also wiki repository when transfer a project 2013-03-25 10:47:47 +02:00
Dmitriy Zaporozhets 1fb99264a9 Use TransferContext for project 2013-03-25 10:47:22 +02:00
Dmitriy Zaporozhets 850881a2ef add admin ability to edit project settings from project area 2013-03-25 10:46:57 +02:00
Riyad Preukschas 6e15284844 Merge pull request #3354 from vinodc/install-docs-typo-fix 
Fixing a minor typo in the installation docs
 2013-03-25 00:49:19 -07:00
Dmitriy Zaporozhets afa9f6045a Merge branch 'more-links-in-readme' of /home/git/repositories/gitlab/gitlabhq 2013-03-25 07:39:23 +00:00
Vinod Chandru df46903dbe Fixing a minor typo in the installation docs 2013-03-24 20:23:02 -07:00
Dmitriy Zaporozhets 5f159d4bc0 Merge pull request #3335 from zzet/patch-4 
Update databases.md
 2013-03-24 03:44:14 -07:00
Andrew Kumanyaev 4cc27fd9e1 Update database.yml.postgresql 2013-03-24 14:10:32 +04:00
Dmitriy Zaporozhets 38ea3939b2 Merge branch 'hiroponz-fix-404-json-file' 2013-03-24 12:01:56 +02:00
Dmitriy Zaporozhets 29b0ac489b move edit to separate controller. This fixes #3265 2013-03-24 11:57:44 +02:00
Andrew Kumanyaev 159cd0d742 Update databases.md 2013-03-24 13:48:23 +04:00
Dmitriy Zaporozhets b6641d6932 Merge branch 'fix-404-json-file' of https://github.com/hiroponz/gitlabhq into hiroponz-fix-404-json-file 2013-03-24 11:26:57 +02:00
Dmitriy Zaporozhets 979dcdba95 security update of crack gem 2013-03-24 11:24:26 +02:00
Sytse Sijbrandij 0d56b1b07f Updated links to gitlab.com and added the last doc files. 2013-03-23 21:20:09 +01:00
Sytse Sijbrandij c4f8d34b7d spelling error 2013-03-23 21:06:00 +01:00
Sytse Sijbrandij de3b181a69 5.0 should no longer be on the roadmap 2013-03-23 21:05:42 +01:00
Dmitriy Zaporozhets 77faffbda3 Merge pull request #3305 from dosire/update-ruby 
Update ruby to latest version.
 2013-03-22 11:04:00 -07:00
Sytse Sijbrandij 5cc5b74e8e Update ruby to latest version. 2013-03-22 18:34:59 +01:00
Dmitriy Zaporozhets e48fdde4f8 Merge pull request #3300 from aus/patch-1 
Change gollum repo to use https:// instead of git://
 2013-03-22 10:11:15 -07:00
Dmitriy Zaporozhets 747706a83a Merge pull request #3303 from dosire/attribute 
Attribution as mentioned in https://news.ycombinator.com/item?id=5423635
 2013-03-22 10:10:07 -07:00
Sytse Sijbrandij 78dd9a1481 All involved are mentioned. https://news.ycombinator.com/item?id=5424050 2013-03-22 17:54:42 +01:00
Dmitriy Zaporozhets c0da61c6d8 fix xss issue in blame 2013-03-22 18:52:25 +02:00
Sytse Sijbrandij 3869cfecc1 Use real name. 2013-03-22 17:42:31 +01:00
Sytse Sijbrandij ccc8806758 Attribution as mentioned in https://news.ycombinator.com/item?id=5423635 2013-03-22 17:39:22 +01:00
Austin Robertson ba1dbd39fb Change Gemfile.lock repo to use https:// 2013-03-22 10:38:27 -05:00
Austin Robertson 693dcce6bc Change gollum repo to use https:// instead of git:// 
A lot of people might have firewalls blocking the git:// protocol. Using https:// makes this easier and matches the other git repositories in the Gemfile.
 2013-03-22 10:31:19 -05:00
Dmitriy Zaporozhets de2c189ec1 fix blame view head nav 2013-03-22 15:11:16 +02:00
Dmitriy Zaporozhets 84043e8e44 Fix lines and line numbers being squashed in File -> blame 2013-03-22 15:08:02 +02:00
Dmitriy Zaporozhets 235605fc6d Merge pull request #3288 from hiroponz/fix-style-network-graph 
Fix style of network graph.
 2013-03-22 00:43:26 -07:00
Sato Hiroyuki f5e001bd8c Using arrowed line only if it connects to not first parent. 
It is easy to see which branch is merged.
 2013-03-22 16:09:21 +09:00
Sato Hiroyuki 26606aa2ec Fix style of network graph. 
refs #3258
 2013-03-22 10:11:53 +09:00
Dmitriy Zaporozhets 5f9d654939 Dont show '0 additions and 0 deletions' message for commit 2013-03-21 22:50:18 +02:00
Dmitriy Zaporozhets ad5ea14210 Move commit.show partial from commits/ to commit/ 2013-03-21 22:22:54 +02:00
Dmitriy Zaporozhets fec283889b fix commit-description css on commit.show 2013-03-21 22:22:21 +02:00
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 d6338a8482 Merge pull request #3258 from hiroponz/display-commit-msg 
Display commit message on network graph.
 2013-03-21 09:58:57 -07:00
Sato Hiroyuki 06c5389780 Fix travis failure randomly, because Capybara.default_wait_time is too short. 2013-03-21 15:24:06 +00:00