OSDN Git Service
Valeriy Sizov [Mon, 2 Jul 2012 20:39:38 +0000 (23:39 +0300)]
InlineDiff: small cleaning
Valeriy Sizov [Mon, 2 Jul 2012 20:34:25 +0000 (23:34 +0300)]
InlineDiff: refactoring
Valeriy Sizov [Mon, 2 Jul 2012 20:08:07 +0000 (23:08 +0300)]
InlineDiff: base implementation
Dmitriy Zaporozhets [Mon, 2 Jul 2012 19:29:15 +0000 (19:29 +0000)]
Merge branch 'feature/config' of dev.gitlabhq.com:gitlabhq
randx [Mon, 2 Jul 2012 18:59:48 +0000 (21:59 +0300)]
Finished with configs
Dmitriy Zaporozhets [Mon, 2 Jul 2012 18:51:48 +0000 (21:51 +0300)]
Epic: Gitlab configuration with default values
Dmitriy Zaporozhets [Mon, 2 Jul 2012 09:15:23 +0000 (12:15 +0300)]
Fix MR tab width
Dmitriy Zaporozhets [Mon, 2 Jul 2012 08:52:23 +0000 (01:52 -0700)]
Merge pull request #1023 from SaitoWu/feature/https
Feature/https
Saito [Mon, 2 Jul 2012 08:44:45 +0000 (16:44 +0800)]
bypass gitolite update hook, and set an GL_USER variable.
Saito [Mon, 2 Jul 2012 03:07:21 +0000 (11:07 +0800)]
dot needs a escape.
randx [Sat, 30 Jun 2012 22:39:23 +0000 (01:39 +0300)]
UI: Navifation -> full width tabs
randx [Sat, 30 Jun 2012 21:35:24 +0000 (00:35 +0300)]
UI changes:
* .page_title class added. Used for better page headers
* improved help page
* added back links for help pages
* show app version & revision on help page
Backend changes:
* Gitab::Version && Gitlab::Revision constants
randx [Fri, 29 Jun 2012 19:02:22 +0000 (22:02 +0300)]
Merge Request: fix automerge widget
randx [Fri, 29 Jun 2012 18:55:22 +0000 (21:55 +0300)]
Merge Request -> show. Refactored. f5 support for diff
Dmitriy Zaporozhets [Fri, 29 Jun 2012 13:45:41 +0000 (06:45 -0700)]
Merge pull request #1019 from NARKOZ/api
API
Dmitriy Zaporozhets [Fri, 29 Jun 2012 13:44:45 +0000 (06:44 -0700)]
Merge pull request #1020 from SaitoWu/feature/https
Feature/https
Saito [Fri, 29 Jun 2012 13:40:23 +0000 (21:40 +0800)]
fix a npe, and need a patch for path_info
Saito [Fri, 29 Jun 2012 13:39:40 +0000 (21:39 +0800)]
now works with git clone localhost/repo.git now
Nihad Abbasov [Fri, 29 Jun 2012 13:34:08 +0000 (06:34 -0700)]
add project snippets API
Dmitriy Zaporozhets [Fri, 29 Jun 2012 11:53:43 +0000 (04:53 -0700)]
Merge pull request #1018 from glebm/master
Resque Authentication + iFrame view
gleb [Fri, 29 Jun 2012 11:44:55 +0000 (13:44 +0200)]
Refs #1013
Renamed protect_resque.rb => resque_authentication
Integrated resque web with the rest of gitlab
Dmitriy Zaporozhets [Fri, 29 Jun 2012 11:23:25 +0000 (04:23 -0700)]
Merge pull request #1011 from peikk0/config_projects_limit
Add configurable default for projects_limit
Dmitriy Zaporozhets [Fri, 29 Jun 2012 11:25:20 +0000 (14:25 +0300)]
Merge branch 'api' of https://github.com/NARKOZ/gitlabhq
Conflicts:
Gemfile.lock
Dmitriy Zaporozhets [Fri, 29 Jun 2012 11:16:20 +0000 (04:16 -0700)]
Merge pull request #1016 from SaitoWu/feature/https
Feature/https
Pierre GUINOISEAU [Thu, 28 Jun 2012 22:57:10 +0000 (00:57 +0200)]
Add configurable default for projects_limit
Nihad Abbasov [Fri, 29 Jun 2012 10:52:20 +0000 (03:52 -0700)]
return errors in json format
Saito [Fri, 29 Jun 2012 10:49:36 +0000 (18:49 +0800)]
use gitlabhq/grack instead of my fork
Nihad Abbasov [Fri, 29 Jun 2012 10:46:01 +0000 (03:46 -0700)]
refactor API and improve docs
Saito [Fri, 29 Jun 2012 10:11:37 +0000 (18:11 +0800)]
implements protected branches to smart http protocal
Dmitriy Zaporozhets [Fri, 29 Jun 2012 08:30:09 +0000 (01:30 -0700)]
Merge pull request #973 from denispeplin/master
/home/git/repositories is hardcoded in rake task, replace it
Saito [Fri, 29 Jun 2012 07:43:15 +0000 (15:43 +0800)]
integrate with gitlabhq authority
Saito [Fri, 29 Jun 2012 03:30:31 +0000 (11:30 +0800)]
mount grack to git, u can 'git clone localhost/git/xx.git' now
Saito [Fri, 29 Jun 2012 02:52:09 +0000 (10:52 +0800)]
add grack to support smart http protocal for git
Nihad Abbasov [Thu, 28 Jun 2012 14:02:20 +0000 (07:02 -0700)]
show only current user projects
Nihad Abbasov [Wed, 27 Jun 2012 12:51:39 +0000 (05:51 -0700)]
add projects API
Nihad Abbasov [Wed, 27 Jun 2012 11:32:56 +0000 (04:32 -0700)]
add users API
Nihad Abbasov [Wed, 27 Jun 2012 09:26:16 +0000 (02:26 -0700)]
install grape and mount Gitlab::API
randx [Thu, 28 Jun 2012 09:51:50 +0000 (12:51 +0300)]
New Feature: Diff patch file export for commit
randx [Thu, 28 Jun 2012 09:24:41 +0000 (12:24 +0300)]
Updated version & changelog
randx [Wed, 27 Jun 2012 21:54:53 +0000 (00:54 +0300)]
Fix issue #987 #972
randx [Wed, 27 Jun 2012 21:47:12 +0000 (00:47 +0300)]
Strict first project symdol to letter
Dmitriy Zaporozhets [Wed, 27 Jun 2012 21:08:41 +0000 (21:08 +0000)]
Merge branch 'feature/issue_tags' of dev.gitlabhq.com:gitlabhq
randx [Wed, 27 Jun 2012 20:13:44 +0000 (23:13 +0300)]
Issues tags: refactoring
Dmitriy Zaporozhets [Wed, 27 Jun 2012 18:30:35 +0000 (21:30 +0300)]
Remove critical status from Issue. Move sort instead
Dmitriy Zaporozhets [Wed, 27 Jun 2012 18:20:35 +0000 (21:20 +0300)]
Issue Labels: Edit, show, index + filter
Dmitriy Zaporozhets [Wed, 27 Jun 2012 06:41:49 +0000 (23:41 -0700)]
Merge pull request #971 from gingko/master
Automatic password creation..
Jakub Troszok [Tue, 26 Jun 2012 22:55:54 +0000 (00:55 +0200)]
Fixing requests tests.
Jakub Troszok [Tue, 26 Jun 2012 21:59:08 +0000 (23:59 +0200)]
Added option to automaticaly generate passwords for new users.
randx [Tue, 26 Jun 2012 21:05:47 +0000 (00:05 +0300)]
Informative search results page
randx [Tue, 26 Jun 2012 20:34:23 +0000 (23:34 +0300)]
issues_table css class
randx [Tue, 26 Jun 2012 19:23:49 +0000 (22:23 +0300)]
Issues list more compact now
randx [Tue, 26 Jun 2012 18:47:25 +0000 (21:47 +0300)]
Issues can be unassigned now
randx [Tue, 26 Jun 2012 18:23:09 +0000 (21:23 +0300)]
Reannotated
randx [Tue, 26 Jun 2012 18:20:05 +0000 (21:20 +0300)]
Comment icons for Issues, MR lists
randx [Tue, 26 Jun 2012 16:20:47 +0000 (19:20 +0300)]
up to 2.6.3
Dmitriy Zaporozhets [Tue, 26 Jun 2012 16:15:39 +0000 (09:15 -0700)]
Merge pull request #982 from JamesEarlDouglas/mailer-controller-typo
fix typo: 'avaialble' -> 'available'
James Earl Douglas [Tue, 26 Jun 2012 16:17:23 +0000 (09:17 -0700)]
fix typo: 'avaialble' -> 'available'
randx [Tue, 26 Jun 2012 16:08:44 +0000 (19:08 +0300)]
MR: merged badge. Removed colors from MR list
Dmitriy Zaporozhets [Tue, 26 Jun 2012 07:55:25 +0000 (10:55 +0300)]
Fix ldap blank password
Denis Peplin [Mon, 25 Jun 2012 04:54:02 +0000 (08:54 +0400)]
Replace hardcoded '/home/git/repositories/' with GIT_HOST['base_path']
Jakub Troszok [Sun, 24 Jun 2012 20:51:58 +0000 (22:51 +0200)]
Added tests for automatic password generation.
Jakub Troszok [Sun, 24 Jun 2012 20:38:29 +0000 (22:38 +0200)]
Implementing automatic password generation.
Jakub Troszok [Sun, 24 Jun 2012 20:26:13 +0000 (22:26 +0200)]
Implementing automatic password creation.
randx [Sun, 24 Jun 2012 07:01:42 +0000 (10:01 +0300)]
Fix IssueObserver current_user assign. Refactored observers
randx [Sun, 24 Jun 2012 06:33:22 +0000 (09:33 +0300)]
Merge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github.com/robbkidd/gitlabhq into robbkidd-separate_user_and_issue_observer_from_mail_observer
Valeriy Sizov [Sat, 23 Jun 2012 22:14:45 +0000 (01:14 +0300)]
Diff refactoring
Valeriy Sizov [Sat, 23 Jun 2012 21:55:23 +0000 (00:55 +0300)]
small clean of CommitDecorator
Valeriy Sizov [Sat, 23 Jun 2012 10:16:21 +0000 (13:16 +0300)]
update doc
Valeriy Sizov [Sat, 23 Jun 2012 10:09:06 +0000 (13:09 +0300)]
Update master
randx [Fri, 22 Jun 2012 20:50:58 +0000 (23:50 +0300)]
Up to 2.6.2
randx [Fri, 22 Jun 2012 20:46:57 +0000 (23:46 +0300)]
Force resque protection
randx [Fri, 22 Jun 2012 20:29:31 +0000 (23:29 +0300)]
Fixed network graph keyboard nav
randx [Fri, 22 Jun 2012 19:49:03 +0000 (22:49 +0300)]
Up to 2.6.1
randx [Fri, 22 Jun 2012 19:39:03 +0000 (22:39 +0300)]
Fix project redirect after destroy
Dmitriy Zaporozhets [Fri, 22 Jun 2012 10:11:23 +0000 (03:11 -0700)]
Merge pull request #961 from NARKOZ/load_assets_group
load assets group to allow lazy compilation in production
Nihad Abbasov [Fri, 22 Jun 2012 10:09:36 +0000 (03:09 -0700)]
load assets group to allow lazy compilation in production
Dmitriy Zaporozhets [Fri, 22 Jun 2012 09:15:36 +0000 (02:15 -0700)]
Merge pull request #959 from NARKOZ/raphael-js
Downgrade Raphael.js
Nihad Abbasov [Fri, 22 Jun 2012 09:00:09 +0000 (02:00 -0700)]
move assets gems to assets group
Nihad Abbasov [Fri, 22 Jun 2012 08:57:05 +0000 (01:57 -0700)]
downgrade raphael js to 1.5.2
randx [Thu, 21 Jun 2012 17:25:23 +0000 (20:25 +0300)]
Up to 2.6
randx [Thu, 21 Jun 2012 16:05:09 +0000 (19:05 +0300)]
admin area -> search for users
randx [Thu, 21 Jun 2012 15:54:57 +0000 (18:54 +0300)]
admin area -> search for projecs
randx [Thu, 21 Jun 2012 15:41:22 +0000 (18:41 +0300)]
Pushed widget improved
randx [Thu, 21 Jun 2012 14:23:51 +0000 (17:23 +0300)]
resque auth example
randx [Thu, 21 Jun 2012 14:23:25 +0000 (17:23 +0300)]
Few minor css improvements
randx [Thu, 21 Jun 2012 13:43:40 +0000 (16:43 +0300)]
Backgrounds for Issues
Dmitriy Zaporozhets [Thu, 21 Jun 2012 05:29:53 +0000 (08:29 +0300)]
Issues & MR legend
randx [Thu, 21 Jun 2012 06:58:05 +0000 (09:58 +0300)]
lets comment browse feature
Robb Kidd [Thu, 21 Jun 2012 01:23:05 +0000 (21:23 -0400)]
Protect IssueObserver#send_reassigned_email method.
Zevs [Wed, 20 Jun 2012 21:21:13 +0000 (00:21 +0300)]
remove double negative
Dmitriy Zaporozhets [Wed, 20 Jun 2012 20:09:33 +0000 (13:09 -0700)]
Merge pull request #952 from gitlabhq/remove_link_to_function
Get rid of deprecated link_to_function
randx [Wed, 20 Jun 2012 20:08:10 +0000 (23:08 +0300)]
missed ;
randx [Wed, 20 Jun 2012 18:29:55 +0000 (21:29 +0300)]
Get rid of deprecated link_to_function
Robb Kidd [Wed, 20 Jun 2012 17:48:34 +0000 (13:48 -0400)]
Remove :issue from MailerObserver; handled by IssueObserver now.
:issue snuck back in during rebasing.
Robb Kidd [Wed, 20 Jun 2012 17:18:29 +0000 (13:18 -0400)]
Remove upvotes method from Issue.
Must have snuck in during one of the multiple rebases while observers were
being refactored.
Robb Kidd [Wed, 20 Jun 2012 16:29:10 +0000 (12:29 -0400)]
Extract observation of User to a UserObserver
Robb Kidd [Fri, 15 Jun 2012 20:23:28 +0000 (16:23 -0400)]
Deliver issue mails.
It helps to actually deliver messages.
Robb Kidd [Tue, 12 Jun 2012 18:27:03 +0000 (14:27 -0400)]
Disable observers in specs. Enable only when observer is under test.
Used the built-in observer enable/disable feature in ActiveModel[1].
ActiveRecord::Base includes ActiveModel::Observing which provides this
behavior.
Simple wraps to enable the observer under test were added to the specs
for: ActivityObserver, IssueObserver, Admin::Users and Issues.
The spec for Project.last_activity was refactored to separate the tests
for #last_activity and #last_activity_date. Each had doubles added to
isolate the spec from the hidden dependency on the ActivityObserver
action to create an Event for the project when an Issue is created. This
ActivityObserver behavior is already tested by its spec.
[1] http://api.rubyonrails.org/classes/ActiveModel/ObserverArray.html
Robb Kidd [Mon, 21 May 2012 20:05:12 +0000 (16:05 -0400)]
Add resque_spec to test queuing mail.
Robb Kidd [Mon, 21 May 2012 17:30:53 +0000 (13:30 -0400)]
Make IssueObserver handle issus, not MailerObserver