OSDN Git Service
Alex Denisov [Wed, 29 Aug 2012 08:42:15 +0000 (11:42 +0300)]
Merge branch 'master' into issue_status_changed_notifications
Alex Denisov [Wed, 29 Aug 2012 08:21:14 +0000 (11:21 +0300)]
Merge branch 'master' into issue_status_changed_notifications
Alex Denisov [Wed, 29 Aug 2012 07:50:35 +0000 (10:50 +0300)]
Duplicate code removed from IssueObserver#after_update
Alex Denisov [Wed, 29 Aug 2012 07:48:17 +0000 (10:48 +0300)]
Notification sends to issue author and assignee if issue being reopened or closed
Alex Denisov [Wed, 29 Aug 2012 06:49:39 +0000 (09:49 +0300)]
Issue_status_changed email added
Dmitriy Zaporozhets [Wed, 29 Aug 2012 05:57:16 +0000 (22:57 -0700)]
Merge pull request #1323 from tsigo/factory_girl
FactoryGirl and spec cleanup
Robert Speicher [Wed, 29 Aug 2012 05:55:41 +0000 (01:55 -0400)]
Only include StubbedRepository in Project model
Dmitriy Zaporozhets [Wed, 29 Aug 2012 04:58:22 +0000 (07:58 +0300)]
Fix test i broke with ssk key validation. Added Key.user_id as attr_protected
Dmitriy Zaporozhets [Wed, 29 Aug 2012 04:13:29 +0000 (07:13 +0300)]
Add ssh key validation
Robert Speicher [Wed, 29 Aug 2012 01:15:21 +0000 (21:15 -0400)]
Remove pkey.example
Robert Speicher [Wed, 29 Aug 2012 01:13:22 +0000 (21:13 -0400)]
Remove all instances to 'gitlabhq_x' seed repositories from specs and features
We now need only one seed repo! Also cleans up the seeding script.
Robert Speicher [Wed, 29 Aug 2012 00:57:54 +0000 (20:57 -0400)]
Simplify StubbedRepository after GitHost changes from master
Robert Speicher [Tue, 28 Aug 2012 11:01:27 +0000 (07:01 -0400)]
Simple model spec changes made possible by new factories
Robert Speicher [Tue, 28 Aug 2012 10:57:00 +0000 (06:57 -0400)]
Add deploy_key and personal_key factories
Robert Speicher [Tue, 28 Aug 2012 05:42:28 +0000 (01:42 -0400)]
All specs and features currently passing with FactoryGirl
Robert Speicher [Tue, 28 Aug 2012 05:28:47 +0000 (01:28 -0400)]
Remove spec/factory and spec/factories
Robert Speicher [Tue, 28 Aug 2012 05:28:09 +0000 (01:28 -0400)]
Add factory_girl_rails gem
randx [Tue, 28 Aug 2012 21:44:26 +0000 (00:44 +0300)]
Handle invalid ssh exception
randx [Tue, 28 Aug 2012 21:33:19 +0000 (00:33 +0300)]
Gitlab::Gitolite final fixes. Seems like all functionality is working correctly now
randx [Tue, 28 Aug 2012 21:19:34 +0000 (00:19 +0300)]
Fixed access to removed method
randx [Tue, 28 Aug 2012 21:16:33 +0000 (00:16 +0300)]
fixed configure call within gitolite
randx [Tue, 28 Aug 2012 21:07:57 +0000 (00:07 +0300)]
Merge branch 'refactor/githost'
randx [Tue, 28 Aug 2012 21:04:06 +0000 (00:04 +0300)]
Use similar interface to access gitolite
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
Dmitriy Zaporozhets [Tue, 28 Aug 2012 14:00:55 +0000 (07:00 -0700)]
Merge pull request #1313 from LeonB/master
Fixed some hardcoded paths based on issue #1272
LeonB [Tue, 28 Aug 2012 12:18:49 +0000 (14:18 +0200)]
Line not needed anymore
LeonB [Tue, 28 Aug 2012 11:06:05 +0000 (13:06 +0200)]
Added hooks_path option example
Dmitriy Zaporozhets [Tue, 28 Aug 2012 10:47:13 +0000 (13:47 +0300)]
Simplify setup for nginx, initd with already predefined files
Dmitriy Zaporozhets [Tue, 28 Aug 2012 10:09:43 +0000 (03:09 -0700)]
Merge pull request #1315 from fixe/patch-2
Fixed typo
Tiago Ribeiro [Tue, 28 Aug 2012 10:09:10 +0000 (12:09 +0200)]
Fixed typo
LeonB [Tue, 28 Aug 2012 08:57:23 +0000 (10:57 +0200)]
Fixed some hardcoded paths
New config option: git_hooks_path
Dmitriy Zaporozhets [Tue, 28 Aug 2012 05:44:38 +0000 (22:44 -0700)]
Merge pull request #1290 from riyad/improve-gfm-user-docs
Improve GFM user docs
Riyad Preukschas [Fri, 24 Aug 2012 15:44:47 +0000 (17:44 +0200)]
Revamp GFM user docs.
Riyad Preukschas [Mon, 27 Aug 2012 19:20:13 +0000 (21:20 +0200)]
Split and reformat markdown options and add refs to their docs.
Also add hard_wrap option.
Riyad Preukschas [Fri, 24 Aug 2012 15:35:21 +0000 (17:35 +0200)]
Update forms to show consistent link to GFM.
Dmitriy Zaporozhets [Mon, 27 Aug 2012 18:50:26 +0000 (11:50 -0700)]
Merge pull request #1274 from wiggle/bulk_permissions_tasks
Rake tasks to assign permissions to users
Dmitriy Zaporozhets [Mon, 27 Aug 2012 18:13:13 +0000 (11:13 -0700)]
Merge pull request #985 from timspin/fix-gitolite-refs
Adds refs to gitolite.conf with $ at the end
Dmitriy Zaporozhets [Mon, 27 Aug 2012 18:04:00 +0000 (11:04 -0700)]
Merge pull request #993 from veprbl/fix_archiving_prefix
Download button: put files into a directory
Dmitriy Zaporozhets [Mon, 27 Aug 2012 11:58:32 +0000 (04:58 -0700)]
Merge pull request #1301 from Mikulas/help-web-hooks-typo
fix web hooks help view commit count off by one
Dmitriy Zaporozhets [Mon, 27 Aug 2012 08:33:06 +0000 (01:33 -0700)]
Merge pull request #1307 from purwandi/master
use high quality icon on folder icon
Dmitriy Zaporozhets [Mon, 27 Aug 2012 06:40:55 +0000 (23:40 -0700)]
Merge pull request #1305 from AlexDenisov/project_access_notifications
Project access notifications
Purwandi [Mon, 27 Aug 2012 05:43:28 +0000 (12:43 +0700)]
Replace folder icon to use high quality
Alex Denisov [Sun, 26 Aug 2012 21:32:03 +0000 (00:32 +0300)]
Send notification on update UserProject relation (access changed)
Alex Denisov [Sun, 26 Aug 2012 21:13:03 +0000 (00:13 +0300)]
Send notifiation on create UserProject relation (access granted)
randx [Sat, 25 Aug 2012 22:40:01 +0000 (01:40 +0300)]
No need to chown hooks in backup script any mroe
randx [Sat, 25 Aug 2012 20:39:01 +0000 (23:39 +0300)]
Project git clone panel
Dmitriy Zaporozhets [Sat, 25 Aug 2012 20:04:41 +0000 (13:04 -0700)]
Merge pull request #1110 from gliptak/patch-1
Display configured git repository location on error page
Dmitriy Zaporozhets [Sat, 25 Aug 2012 20:03:44 +0000 (13:03 -0700)]
Merge pull request #1300 from tsigo/spec_reorganize
Spec cleanup/reorganization
Mikuláš Dítě [Sat, 25 Aug 2012 18:48:30 +0000 (20:48 +0200)]
fix web hooks help view commit count off by one
Robert Speicher [Sat, 25 Aug 2012 17:54:38 +0000 (13:54 -0400)]
Minor cleanup to Milestone model and spec
Back-ported from my still-in-progress major cleanup.
Robert Speicher [Sat, 25 Aug 2012 17:43:55 +0000 (13:43 -0400)]
Clean up request specs
Robert Speicher [Sat, 25 Aug 2012 17:31:50 +0000 (13:31 -0400)]
Add a simple `api` method to ApiHelpers, replacing api_prefix
See docs for usage
Robert Speicher [Thu, 23 Aug 2012 09:19:40 +0000 (05:19 -0400)]
Cleanup spec/support folder and spec/spec_helper
Changes:
* Move spec/monkeypatch to spec/support
* Remove unused support/shared_examples
* Move support/api to support/api_helpers to match module name
* Move support/login to support/login_helpers to match module name
* Move API specs to requests/api (convention over configuration)
* Remove unused support/js_patch
* Simplify login_as helper
* Move DatabaseCleaner stuff to its own support file
* Remove unnecessary configuration and requires from spec_helper
randx [Sat, 25 Aug 2012 17:31:19 +0000 (20:31 +0300)]
Admin area -> user form
Robert Speicher [Thu, 16 Aug 2012 03:16:33 +0000 (23:16 -0400)]
Move observer specs out of spec/models into spec/observers
randx [Sat, 25 Aug 2012 16:47:00 +0000 (19:47 +0300)]
better flash message style
randx [Sat, 25 Aug 2012 16:42:34 +0000 (19:42 +0300)]
scss refactoring
randx [Sat, 25 Aug 2012 16:21:11 +0000 (19:21 +0300)]
Move snippets api doc to separate file
randx [Fri, 24 Aug 2012 12:34:27 +0000 (15:34 +0300)]
Show labels specific to project
Dmitriy Zaporozhets [Sat, 25 Aug 2012 13:16:40 +0000 (06:16 -0700)]
Merge pull request #1295 from jouve/fix_mr_form
fix merge request form
Dmitriy Zaporozhets [Sat, 25 Aug 2012 13:15:59 +0000 (06:15 -0700)]
Merge pull request #1296 from Wetpaint/master
Hide the gravatar tip in the profile menu if gravatar is disabled.
Dmitriy Zaporozhets [Sat, 25 Aug 2012 13:15:18 +0000 (06:15 -0700)]
Merge pull request #1297 from SaitoWu/issues/1269
fix git push body bigger than 112k problem
Saito [Sat, 25 Aug 2012 07:24:21 +0000 (15:24 +0800)]
fix git push body bigger than 112k problem
Joe Hillenbrand [Fri, 24 Aug 2012 23:04:07 +0000 (16:04 -0700)]
Hide gravatar tip if gravatar is disabled.
Cyril [Fri, 24 Aug 2012 22:22:45 +0000 (00:22 +0200)]
fix merge request form
randx [Fri, 24 Aug 2012 10:17:19 +0000 (13:17 +0300)]
Final fix for dashboard cucumber feature
randx [Fri, 24 Aug 2012 10:07:14 +0000 (13:07 +0300)]
Merge branch 'feature/labels'
randx [Fri, 24 Aug 2012 10:05:40 +0000 (13:05 +0300)]
Feature: Labels page. Index page
randx [Fri, 24 Aug 2012 09:17:05 +0000 (12:17 +0300)]
Fix dashboard issues atom feed rspec
randx [Fri, 24 Aug 2012 09:03:48 +0000 (12:03 +0300)]
Up to 2.8.2
randx [Fri, 24 Aug 2012 08:48:30 +0000 (11:48 +0300)]
Trying to get rid of random dashboard/issues cucumber fail
Seif Attar [Thu, 23 Aug 2012 09:48:55 +0000 (10:48 +0100)]
Task to assign user developer role to all projects
Seif Attar [Thu, 23 Aug 2012 09:48:45 +0000 (10:48 +0100)]
rake task to add all users to all projects
Dmitriy Zaporozhets [Thu, 23 Aug 2012 06:17:18 +0000 (09:17 +0300)]
Up to 2.8.1
Dmitriy Zaporozhets [Thu, 23 Aug 2012 07:32:37 +0000 (00:32 -0700)]
Merge pull request #1263 from dosire/merge_base_for_merge_request
Show only the commits that are newer in the merge request.
Dmitriy Zaporozhets [Thu, 23 Aug 2012 05:28:00 +0000 (08:28 +0300)]
Fix meta gem version
Dmitriy Zaporozhets [Thu, 23 Aug 2012 05:15:30 +0000 (08:15 +0300)]
gitlab_meta gem added
Dmitriy Zaporozhets [Wed, 22 Aug 2012 11:33:50 +0000 (04:33 -0700)]
Merge pull request #1239 from tsigo/disable_gravatar
Allow disabling Gravatars in gitlab.yml settings
Dmitriy Zaporozhets [Wed, 22 Aug 2012 00:56:53 +0000 (03:56 +0300)]
1. Better message if no ssh key
2. SSH Keys Help page
randx [Tue, 21 Aug 2012 22:25:11 +0000 (01:25 +0300)]
draper Gemfile.lock
Dmitriy Zaporozhets [Fri, 24 Aug 2012 08:29:52 +0000 (01:29 -0700)]
Merge pull request #1286 from steveklabnik/master
Misspelled Draper
Dmitriy Zaporozhets [Fri, 24 Aug 2012 08:29:05 +0000 (01:29 -0700)]
Merge pull request #1284 from jouve/fix-inline-forms
fix inline forms
Dmitriy Zaporozhets [Fri, 24 Aug 2012 08:09:21 +0000 (01:09 -0700)]
Merge pull request #1285 from tsigo/gemfile_cleanup
Gemfile cleanup
Steve Klabnik [Fri, 24 Aug 2012 00:11:37 +0000 (17:11 -0700)]
Fix Draper spelling in Gemfile
Steve Klabnik [Fri, 24 Aug 2012 00:01:30 +0000 (17:01 -0700)]
Misspelled Draper
:)
Robert Speicher [Thu, 23 Aug 2012 23:21:55 +0000 (19:21 -0400)]
Remove unused minitest and turn gems
Robert Speicher [Thu, 23 Aug 2012 23:21:20 +0000 (19:21 -0400)]
Move gitlab_meta gem to :production group
Robert Speicher [Thu, 23 Aug 2012 23:20:28 +0000 (19:20 -0400)]
Remove rails-footnotes gem and its related files
Cyril [Thu, 23 Aug 2012 21:04:43 +0000 (23:04 +0200)]
fix inline forms
Dmitriy Zaporozhets [Thu, 23 Aug 2012 19:06:03 +0000 (12:06 -0700)]
Merge pull request #1283 from riyad/improve-gfm-code-docs
Improve GFM code documentation
Riyad Preukschas [Thu, 23 Aug 2012 18:10:06 +0000 (20:10 +0200)]
Improve GFM code documentation
Dmitriy Zaporozhets [Thu, 23 Aug 2012 13:56:55 +0000 (06:56 -0700)]
Merge pull request #1231 from NARKOZ/preview_notes
Preview window is not closed after post
Dmitriy Zaporozhets [Thu, 23 Aug 2012 11:26:22 +0000 (04:26 -0700)]
Merge pull request #1275 from tsigo/no_ci_simplecov
Don't run SimpleCov on Travis
Robert Speicher [Thu, 23 Aug 2012 11:24:25 +0000 (07:24 -0400)]
Don't run SimpleCov on Travis
Dmitriy Zaporozhets [Tue, 21 Aug 2012 22:15:26 +0000 (01:15 +0300)]
Up to 2.8
Sytse Sijbrandij [Tue, 21 Aug 2012 21:07:11 +0000 (23:07 +0200)]
Show only the commits that are newer in the merge request.
randx [Tue, 21 Aug 2012 19:44:49 +0000 (22:44 +0300)]
Updated app:status & docs with hooks. Removed write_hooks from app:setup
Dmitriy Zaporozhets [Wed, 22 Aug 2012 06:27:03 +0000 (23:27 -0700)]
Merge pull request #1266 from tsigo/cucumber_speedup
Speed up the "Project Network Graph" cucumber feature
Robert Speicher [Wed, 22 Aug 2012 02:48:15 +0000 (22:48 -0400)]
Fix cucumber failure that only happened on Travis
Robert Speicher [Wed, 22 Aug 2012 02:20:09 +0000 (22:20 -0400)]
Speed up the "Project Network Graph" cucumber feature
This change involves stubbing out the call to `Grit::Commit.find_all`
and limiting the number of commits to 10 vs. the standard of 650 used by
`Gitlab::GraphCommit.to_graph`.
Prior to this change, this single feature required almost 3 minutes of
running time and over 2 GB of memory on my machine. Now it takes less
than 3 seconds.
randx [Tue, 21 Aug 2012 18:34:33 +0000 (21:34 +0300)]
Merge branch 'refactor_notify' of https://github.com/tsigo/gitlabhq into tsigo-refactor_notify