OSDN Git Service
Dmitriy Zaporozhets [Tue, 26 Mar 2013 12:41:57 +0000 (14:41 +0200)]
refactor issue observer spec
Dmitriy Zaporozhets [Tue, 26 Mar 2013 09:17:49 +0000 (11:17 +0200)]
fixed tests
Dmitriy Zaporozhets [Tue, 26 Mar 2013 09:06:24 +0000 (11:06 +0200)]
reject current_user from close issue emails
Dmitriy Zaporozhets [Tue, 26 Mar 2013 08:16:49 +0000 (10:16 +0200)]
notification level for user
Dmitriy Zaporozhets [Tue, 26 Mar 2013 07:48:13 +0000 (09:48 +0200)]
NotificationService for resolving email notification logic
Dmitriy Zaporozhets [Tue, 26 Mar 2013 07:47:40 +0000 (09:47 +0200)]
Use NotificationService for observers pt1
Sytse Sijbrandij [Sun, 24 Mar 2013 21:23:28 +0000 (22:23 +0100)]
Updating based on Dmitriy his comments.
Sytse Sijbrandij [Sun, 24 Mar 2013 10:02:39 +0000 (11:02 +0100)]
Better header and detail why you need two times the storage. Also moving memory and storage to the bottom, OS is more important.
Sytse Sijbrandij [Sat, 23 Mar 2013 20:38:51 +0000 (21:38 +0100)]
Corrected mistake, added hint for windows users.
Sytse Sijbrandij [Sat, 23 Mar 2013 20:34:45 +0000 (21:34 +0100)]
Combine it with the memory requirements that where already there.
Sytse Sijbrandij [Sat, 23 Mar 2013 14:56:29 +0000 (15:56 +0100)]
Added memory requirements based on https://news.ycombinator.com/item?id=
5423851
Dmitriy Zaporozhets [Mon, 25 Mar 2013 18:55:20 +0000 (11:55 -0700)]
Merge pull request #3377 from SaitoWu/grit_ext
bump version of grit_ext
Saito [Mon, 25 Mar 2013 17:12:29 +0000 (01:12 +0800)]
bump version of grit_ext
Dmitriy Zaporozhets [Mon, 25 Mar 2013 14:12:12 +0000 (16:12 +0200)]
Update changelog
Dmitriy Zaporozhets [Mon, 25 Mar 2013 14:10:30 +0000 (16:10 +0200)]
Merge branch 'feature/login_with_username'
Dmitriy Zaporozhets [Mon, 25 Mar 2013 14:10:14 +0000 (16:10 +0200)]
login with both email or username
Dmitriy Zaporozhets [Mon, 25 Mar 2013 13:52:54 +0000 (15:52 +0200)]
try to move wiki if it does not exist
Dmitriy Zaporozhets [Mon, 25 Mar 2013 13:27:09 +0000 (15:27 +0200)]
Updated changelog with transfer & security changes
Dmitriy Zaporozhets [Mon, 25 Mar 2013 13:20:42 +0000 (15:20 +0200)]
Merge branch 'improve/project_transfer'
Dmitriy Zaporozhets [Mon, 25 Mar 2013 13:19:06 +0000 (15:19 +0200)]
require gitlab-shell v1.2.0 now
Dmitriy Zaporozhets [Mon, 25 Mar 2013 12:58:43 +0000 (14:58 +0200)]
Admin.projects: remove views and route specs
Dmitriy Zaporozhets [Mon, 25 Mar 2013 11:40:08 +0000 (13:40 +0200)]
Updatev security tests since admin is a superuser now. Has access to any project
Dmitriy Zaporozhets [Mon, 25 Mar 2013 11:36:08 +0000 (13:36 +0200)]
Removed not relevant tests for admin.projects
Dmitriy Zaporozhets [Mon, 25 Mar 2013 09:07:11 +0000 (11:07 +0200)]
remove project edit from admin area. Redesigned project page in admin area
Dmitriy Zaporozhets [Mon, 25 Mar 2013 08:48:30 +0000 (10:48 +0200)]
Make transfer action in project controller
Dmitriy Zaporozhets [Mon, 25 Mar 2013 08:47:47 +0000 (10:47 +0200)]
transfer also wiki repository when transfer a project
Dmitriy Zaporozhets [Mon, 25 Mar 2013 08:47:22 +0000 (10:47 +0200)]
Use TransferContext for project
Dmitriy Zaporozhets [Mon, 25 Mar 2013 08:46:57 +0000 (10:46 +0200)]
add admin ability to edit project settings from project area
Riyad Preukschas [Mon, 25 Mar 2013 07:49:19 +0000 (00:49 -0700)]
Merge pull request #3354 from vinodc/install-docs-typo-fix
Fixing a minor typo in the installation docs
Dmitriy Zaporozhets [Mon, 25 Mar 2013 07:39:23 +0000 (07:39 +0000)]
Merge branch 'more-links-in-readme' of /home/git/repositories/gitlab/gitlabhq
Vinod Chandru [Mon, 25 Mar 2013 03:23:02 +0000 (20:23 -0700)]
Fixing a minor typo in the installation docs
Dmitriy Zaporozhets [Sun, 24 Mar 2013 10:44:14 +0000 (03:44 -0700)]
Merge pull request #3335 from zzet/patch-4
Update databases.md
Andrew Kumanyaev [Sun, 24 Mar 2013 10:10:32 +0000 (14:10 +0400)]
Update database.yml.postgresql
Dmitriy Zaporozhets [Sun, 24 Mar 2013 10:01:56 +0000 (12:01 +0200)]
Merge branch 'hiroponz-fix-404-json-file'
Dmitriy Zaporozhets [Sun, 24 Mar 2013 09:57:44 +0000 (11:57 +0200)]
move edit to separate controller. This fixes #3265
Andrew Kumanyaev [Sun, 24 Mar 2013 09:48:23 +0000 (13:48 +0400)]
Update databases.md
Dmitriy Zaporozhets [Sun, 24 Mar 2013 09:26:57 +0000 (11:26 +0200)]
Merge branch 'fix-404-json-file' of https://github.com/hiroponz/gitlabhq into hiroponz-fix-404-json-file
Dmitriy Zaporozhets [Sun, 24 Mar 2013 09:24:26 +0000 (11:24 +0200)]
security update of crack gem
Sytse Sijbrandij [Sat, 23 Mar 2013 20:20:09 +0000 (21:20 +0100)]
Updated links to gitlab.com and added the last doc files.
Sytse Sijbrandij [Sat, 23 Mar 2013 20:06:00 +0000 (21:06 +0100)]
spelling error
Sytse Sijbrandij [Sat, 23 Mar 2013 20:05:42 +0000 (21:05 +0100)]
5.0 should no longer be on the roadmap
Dmitriy Zaporozhets [Fri, 22 Mar 2013 18:04:00 +0000 (11:04 -0700)]
Merge pull request #3305 from dosire/update-ruby
Update ruby to latest version.
Sytse Sijbrandij [Fri, 22 Mar 2013 17:34:59 +0000 (18:34 +0100)]
Update ruby to latest version.
Dmitriy Zaporozhets [Fri, 22 Mar 2013 17:11:15 +0000 (10:11 -0700)]
Merge pull request #3300 from aus/patch-1
Change gollum repo to use https:// instead of git://
Dmitriy Zaporozhets [Fri, 22 Mar 2013 17:10:07 +0000 (10:10 -0700)]
Merge pull request #3303 from dosire/attribute
Attribution as mentioned in https://news.ycombinator.com/item?id=
5423635
Sytse Sijbrandij [Fri, 22 Mar 2013 16:54:42 +0000 (17:54 +0100)]
All involved are mentioned. https://news.ycombinator.com/item?id=
5424050
Dmitriy Zaporozhets [Fri, 22 Mar 2013 16:52:25 +0000 (18:52 +0200)]
fix xss issue in blame
Sytse Sijbrandij [Fri, 22 Mar 2013 16:42:31 +0000 (17:42 +0100)]
Use real name.
Sytse Sijbrandij [Fri, 22 Mar 2013 16:39:22 +0000 (17:39 +0100)]
Attribution as mentioned in https://news.ycombinator.com/item?id=
5423635
Austin Robertson [Fri, 22 Mar 2013 15:38:27 +0000 (10:38 -0500)]
Change Gemfile.lock repo to use https://
Austin Robertson [Fri, 22 Mar 2013 15:31:19 +0000 (10:31 -0500)]
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.
Dmitriy Zaporozhets [Fri, 22 Mar 2013 13:11:16 +0000 (15:11 +0200)]
fix blame view head nav
Dmitriy Zaporozhets [Fri, 22 Mar 2013 13:08:02 +0000 (15:08 +0200)]
Fix lines and line numbers being squashed in File -> blame
Dmitriy Zaporozhets [Fri, 22 Mar 2013 07:43:26 +0000 (00:43 -0700)]
Merge pull request #3288 from hiroponz/fix-style-network-graph
Fix style of network graph.
Sato Hiroyuki [Fri, 22 Mar 2013 02:59:36 +0000 (11:59 +0900)]
Using arrowed line only if it connects to not first parent.
It is easy to see which branch is merged.
Sato Hiroyuki [Fri, 22 Mar 2013 01:07:11 +0000 (10:07 +0900)]
Fix style of network graph.
refs #3258
Dmitriy Zaporozhets [Thu, 21 Mar 2013 20:50:18 +0000 (22:50 +0200)]
Dont show '0 additions and 0 deletions' message for commit
Dmitriy Zaporozhets [Thu, 21 Mar 2013 20:22:54 +0000 (22:22 +0200)]
Move commit.show partial from commits/ to commit/
Dmitriy Zaporozhets [Thu, 21 Mar 2013 20:22:21 +0000 (22:22 +0200)]
fix commit-description css on commit.show
Dmitriy Zaporozhets [Thu, 21 Mar 2013 20:11:08 +0000 (22:11 +0200)]
Move directory logic out of model. Use Gitlab:Shell class to interact with file system
Dmitriy Zaporozhets [Thu, 21 Mar 2013 19:01:14 +0000 (21:01 +0200)]
replace Gitolited mixin with Gitlab::ShellAdapter
Dmitriy Zaporozhets [Thu, 21 Mar 2013 16:58:57 +0000 (09:58 -0700)]
Merge pull request #3258 from hiroponz/display-commit-msg
Display commit message on network graph.
Sato Hiroyuki [Thu, 21 Mar 2013 15:24:06 +0000 (15:24 +0000)]
Fix travis failure randomly, because Capybara.default_wait_time is too short.
Sato Hiroyuki [Thu, 21 Mar 2013 14:41:16 +0000 (14:41 +0000)]
Fix 404 error while displaying json files.
It uses params[:id] instead of request.fullpath.
It should fix #3132.
Dmitriy Zaporozhets [Thu, 21 Mar 2013 14:29:53 +0000 (16:29 +0200)]
Update readme to match 5-0-stable
GitLab [Thu, 21 Mar 2013 13:20:17 +0000 (15:20 +0200)]
Version up to 5.0.0
Sato Hiroyuki [Wed, 20 Mar 2013 09:19:01 +0000 (09:19 +0000)]
Display icon and commit message on network graph.
Sato Hiroyuki [Thu, 21 Mar 2013 12:34:15 +0000 (12:34 +0000)]
Refactor: clean up code.
Dmitriy Zaporozhets [Thu, 21 Mar 2013 07:15:57 +0000 (00:15 -0700)]
Merge pull request #3276 from DarthJDG/fix-group-typo
Fix column heading order in group admin view
Robert Biro [Wed, 20 Mar 2013 22:15:42 +0000 (22:15 +0000)]
Fix column heading order in group admin view
Dmitriy Zaporozhets [Wed, 20 Mar 2013 19:55:25 +0000 (21:55 +0200)]
Use Api.js to handle api calls to gitlab
Dmitriy Zaporozhets [Wed, 20 Mar 2013 18:22:29 +0000 (20:22 +0200)]
Intead of showing 404 give users ability to close MR with missing branches
Dmitriy Zaporozhets [Wed, 20 Mar 2013 17:30:59 +0000 (19:30 +0200)]
remove db:setup & seed_fu from install docs. gitlab:setup does it
Dmitriy Zaporozhets [Wed, 20 Mar 2013 14:41:59 +0000 (16:41 +0200)]
fix test button functionality for project -> service -> gitlab ci
Sato Hiroyuki [Wed, 20 Mar 2013 09:17:12 +0000 (09:17 +0000)]
Rotating graph orientation.
Dmitriy Zaporozhets [Wed, 20 Mar 2013 11:49:32 +0000 (13:49 +0200)]
gitlab 5.0 rc1
Dmitriy Zaporozhets [Wed, 20 Mar 2013 11:41:18 +0000 (13:41 +0200)]
fix gfm helper test
Dmitriy Zaporozhets [Wed, 20 Mar 2013 08:25:11 +0000 (10:25 +0200)]
fix key observer test
Dmitriy Zaporozhets [Wed, 20 Mar 2013 08:19:00 +0000 (10:19 +0200)]
Dont load diff in compare over 100 commits
Dmitriy Zaporozhets [Wed, 20 Mar 2013 07:53:39 +0000 (09:53 +0200)]
send wall message with crtl+enter
Dmitriy Zaporozhets [Wed, 20 Mar 2013 07:35:24 +0000 (00:35 -0700)]
Merge pull request #3247 from Undev/feature/fix_bug_in_team_assigment
Fix bug with downgrade permissions on first project assigment to team
Dmitriy Zaporozhets [Wed, 20 Mar 2013 07:32:45 +0000 (00:32 -0700)]
Merge pull request #3264 from yuters/patch-2
Fix user path in markdown
Dmitriy Zaporozhets [Wed, 20 Mar 2013 07:29:05 +0000 (00:29 -0700)]
Merge pull request #3266 from DanKnox/fix_wiki_cancel_edit_button
Fix the Cancel button on the Edit Wiki page.
Dan Knox [Wed, 20 Mar 2013 04:28:10 +0000 (21:28 -0700)]
Fix the Cancel button on the Edit Wiki page.
The Cancel button on the Edit Wiki page was still redirecting back
to the "Index" page which is no longer the default Wiki page.
This commit changes the Cancel button in the following ways:
* Pressing Cancel while editing an existing Wiki page will now
redirect you back to the latest version of that page.
* Pressing Cancel while editing a brand new Wiki home page that
does not yet exist will redirect you to back to the same Edit
Wiki Home page.
Martin Bastien [Wed, 20 Mar 2013 00:29:59 +0000 (21:29 -0300)]
Fix user path in markdown
Dmitriy Zaporozhets [Tue, 19 Mar 2013 18:11:47 +0000 (20:11 +0200)]
Fix bug showing merge MR in milestone open list
Dmitriy Zaporozhets [Tue, 19 Mar 2013 18:00:41 +0000 (20:00 +0200)]
refactor emails a bit. Add email on ssh key creation
Dmitriy Zaporozhets [Tue, 19 Mar 2013 17:17:59 +0000 (19:17 +0200)]
5.0 beta2
Dmitriy Zaporozhets [Tue, 19 Mar 2013 16:52:17 +0000 (18:52 +0200)]
rails up to 3.2.13
Dmitriy Zaporozhets [Tue, 19 Mar 2013 16:14:59 +0000 (18:14 +0200)]
remove ajax loader from wall
Dmitriy Zaporozhets [Tue, 19 Mar 2013 16:07:14 +0000 (18:07 +0200)]
Dont show blocked users in autocomplete
Dmitriy Zaporozhets [Tue, 19 Mar 2013 15:59:10 +0000 (08:59 -0700)]
Merge pull request #3255 from michelsalib/patch-1
Gitlab does not use gitolite anymore.
Dmitriy Zaporozhets [Tue, 19 Mar 2013 15:53:21 +0000 (17:53 +0200)]
fix incorrectly moved spinach step
Dmitriy Zaporozhets [Tue, 19 Mar 2013 13:54:58 +0000 (15:54 +0200)]
added sanitize and linkify functions. Moved some js to lib/
Dmitriy Zaporozhets [Tue, 19 Mar 2013 13:37:11 +0000 (15:37 +0200)]
removed few outdated tests
Dmitriy Zaporozhets [Tue, 19 Mar 2013 13:11:31 +0000 (15:11 +0200)]
Comment external issue tracker by default in gitlab.yml.example
Dmitriy Zaporozhets [Tue, 19 Mar 2013 13:04:58 +0000 (15:04 +0200)]
use scrollTop solution for both chrome & firefox
Dmitriy Zaporozhets [Tue, 19 Mar 2013 12:58:58 +0000 (14:58 +0200)]
fix wall feature. removed duplicated test
Dmitriy Zaporozhets [Tue, 19 Mar 2013 12:50:26 +0000 (14:50 +0200)]
wall comment does not create an event on dashboard any more
Dmitriy Zaporozhets [Tue, 19 Mar 2013 12:39:32 +0000 (14:39 +0200)]
fix tests. added jquery.timeago.js