OSDN Git Service
Dmitriy Zaporozhets [Mon, 3 Sep 2012 12:04:23 +0000 (05:04 -0700)]
Merge pull request #1360 from NARKOZ/api
API pagination
Nihad Abbasov [Mon, 3 Sep 2012 11:46:29 +0000 (04:46 -0700)]
add pagination to API
Nihad Abbasov [Mon, 3 Sep 2012 11:22:49 +0000 (04:22 -0700)]
add kaminari config with default and max per_page values
Nihad Abbasov [Mon, 3 Sep 2012 10:43:19 +0000 (03:43 -0700)]
bump kaminari
Dmitriy Zaporozhets [Mon, 3 Sep 2012 08:48:51 +0000 (01:48 -0700)]
Merge pull request #1347 from AlexDenisov/api_project_creation
API for new project creation
Dmitriy Zaporozhets [Mon, 3 Sep 2012 05:11:30 +0000 (22:11 -0700)]
Merge pull request #1356 from dosire/non-interactive-aws-install
Update the references to the script and refer to it from the installation manual.
Sytse Sijbrandij [Sun, 2 Sep 2012 20:41:21 +0000 (22:41 +0200)]
Update the references to the script and refer to it from the installation manual.
Update the references to the script and refer to it from the installation manual.
Indent the code block.
Dmitriy Zaporozhets [Sun, 2 Sep 2012 19:21:00 +0000 (12:21 -0700)]
Merge pull request #1327 from logiblocs/master
Trivial fix to docs/installation.md
Dmitriy Zaporozhets [Sun, 2 Sep 2012 19:09:48 +0000 (12:09 -0700)]
Merge pull request #1318 from dosire/non-interactive-aws-install
Non interactive aws install
Dmitriy Zaporozhets [Sun, 2 Sep 2012 18:58:13 +0000 (11:58 -0700)]
Merge pull request #1351 from tsigo/nonrelative_resque
Give Resque route a name and use that for the iframe src
Dmitriy Zaporozhets [Sun, 2 Sep 2012 18:57:33 +0000 (11:57 -0700)]
Merge pull request #1355 from tsigo/gfm_spec_cleanup
GFM spec redesign
Robert Speicher [Sun, 2 Sep 2012 06:13:13 +0000 (02:13 -0400)]
Redesign gfm helper specs
Should now be much clearer about what each spec is actually testing.
For example, instead of testing stuff like link classes and titles in
every single call, we only test those things once, in their own specs.
Robert Speicher [Sun, 2 Sep 2012 03:56:44 +0000 (23:56 -0400)]
Add link_title to CommitDecorator
Robert Speicher [Sun, 2 Sep 2012 03:39:28 +0000 (23:39 -0400)]
Add StaticModel role, and add it to Commit model
Instead of doing this:
link_to(commit.id, project_commit_path(project, id: commit.id))
Note.create(noteable_id: commit.id, noteable_type: "Commit", ...)
It lets us do this:
link_to(commit.id, project_commit_path(project, commit))
Note.create(noteable: commit, ...)
Sytse Sijbrandij [Sun, 2 Sep 2012 16:41:33 +0000 (18:41 +0200)]
Merge branch 'master' into non-interactive-aws-install
Conflicts:
doc/installation.md
Sytse Sijbrandij [Sun, 2 Sep 2012 16:31:16 +0000 (18:31 +0200)]
Non-interactive AWS install by running a single script.
Merge branch 'master' into non-interactive-aws-install
Conflicts:
doc/installation.md
Fix merge mess in installation.md
Sytse Sijbrandij [Sun, 26 Aug 2012 14:18:13 +0000 (16:18 +0200)]
Non-interactive AWS install by running a single script.
Non-interactive AWS install by running a single script.
Complete non-interactive AWS install with one line.
Squash of 28 commits:
Initial commit of complete install script.
Must be sudo.
Non interactive prostgres.
Install mysql with unique password.
Service file.
Add init file.
Nginx config.
Script contains aws specific settings.
Update references after rename.
Prevent localhost ssh prompt.
Postfix with policyd.
Typo in localhost. Postfix package has other name. sudo -l session needs oneliners.
More sudo commands to prevent permission problems.
Change in existing file.
Change in existing file must be referenced.
Switch order.
Postfix comment.
Old way to generate password, less sudo.
todo login
Must use private ip and login instructions.
Starting up.
Fixed and checked various todos.
Use service. Set host name. Go to default dir.
Only works on next login.
Only replace first host.
Cleaned up the comments.
Link to nginx config.
Move to aws dir.
Update links to aws for interactive install.
Existing script stays at the same location.
Change directory. Use the new init scripts for gitlab service and nginx. Use the branch for file downloads. Update with newest changes to installation.md.
Correct reference.
Use master branch since we need the nginx condfig and use absolute paths.
Need to copy with sudo.
randx [Sun, 2 Sep 2012 12:25:54 +0000 (15:25 +0300)]
Fix glm by adding id and classes to sanitize white attrs
Robert Speicher [Sun, 2 Sep 2012 02:56:54 +0000 (22:56 -0400)]
Rename gitlab_flavored_markdown_spec to gitlab_markdown_helper_spec
randx [Sat, 1 Sep 2012 20:35:04 +0000 (23:35 +0300)]
Sanitize glm helper
randx [Sat, 1 Sep 2012 19:21:28 +0000 (22:21 +0300)]
Few fixes for ~ 1000px resolution
Robert Speicher [Fri, 31 Aug 2012 23:28:32 +0000 (19:28 -0400)]
Give Resque route a name and use that for the iframe src
Closes #1350
Alex Denisov [Fri, 31 Aug 2012 08:26:12 +0000 (11:26 +0300)]
Merge branch 'master' into api_project_creation
Alex Denisov [Fri, 31 Aug 2012 08:11:12 +0000 (11:11 +0300)]
Typo and mistakes fixed
Dmitriy Zaporozhets [Fri, 31 Aug 2012 07:51:31 +0000 (00:51 -0700)]
Merge pull request #1326 from AlexDenisov/issue_status_changed_notifications
Issue status changed notifications
Alex Denisov [Fri, 31 Aug 2012 07:28:38 +0000 (10:28 +0300)]
JSON for new project removed from API docs
Alex Denisov [Fri, 31 Aug 2012 07:27:45 +0000 (10:27 +0300)]
Docs changed for Create Project API
Alex Denisov [Fri, 31 Aug 2012 07:25:36 +0000 (10:25 +0300)]
Docs added for Create Project API
Alex Denisov [Fri, 31 Aug 2012 07:15:37 +0000 (10:15 +0300)]
API on Projects creation implemented
randx [Fri, 31 Aug 2012 06:05:44 +0000 (09:05 +0300)]
Freeze project path in admin area
randx [Thu, 30 Aug 2012 19:48:01 +0000 (22:48 +0300)]
gitlab_meta to 2.9
randx [Thu, 30 Aug 2012 19:45:28 +0000 (22:45 +0300)]
v2.9.0pre
randx [Thu, 30 Aug 2012 19:28:45 +0000 (22:28 +0300)]
Js validation for title presence in issue, mr, milestone
randx [Thu, 30 Aug 2012 19:15:34 +0000 (22:15 +0300)]
Changed filters to readable one. Styled some stuff
randx [Thu, 30 Aug 2012 18:31:55 +0000 (21:31 +0300)]
Fixed bunch of js bugs with comments. Also added development tips
randx [Thu, 30 Aug 2012 17:00:16 +0000 (20:00 +0300)]
Removed class 'small' for some buttons. Fixed issue creation
randx [Thu, 30 Aug 2012 16:45:05 +0000 (19:45 +0300)]
fix project.last_activity spec
Dmitriy Zaporozhets [Thu, 30 Aug 2012 06:26:45 +0000 (09:26 +0300)]
Changed colors for buttons. Imporved preview area. Added clone panel to empty project
Dmitriy Zaporozhets [Thu, 30 Aug 2012 13:45:19 +0000 (06:45 -0700)]
Merge pull request #1336 from mmonge/install_nginx_fix
nginx vhost standard
Dmitriy Zaporozhets [Thu, 30 Aug 2012 05:41:43 +0000 (08:41 +0300)]
Gitlab cli for development need at first
Dmitriy Zaporozhets [Thu, 30 Aug 2012 06:09:42 +0000 (09:09 +0300)]
Fixed project last_activity. Links color changed a bit
Dmitriy Zaporozhets [Thu, 30 Aug 2012 05:13:36 +0000 (08:13 +0300)]
Restyled projects list on dashboard
Marvin Monge [Thu, 30 Aug 2012 01:11:22 +0000 (19:11 -0600)]
nginx vhost standard
randx [Wed, 29 Aug 2012 19:29:50 +0000 (22:29 +0300)]
Refactoring scss & improving some UI elements
randx [Wed, 29 Aug 2012 18:23:43 +0000 (21:23 +0300)]
SCSS refactoring & cleanup. First iteration
Dmitriy Zaporozhets [Wed, 29 Aug 2012 16:02:07 +0000 (09:02 -0700)]
Merge pull request #1334 from tsigo/milestone_api_specs
Fix milestone API specs
Dmitriy Zaporozhets [Wed, 29 Aug 2012 16:00:02 +0000 (09:00 -0700)]
Merge pull request #1333 from tsigo/model_specs
Increased model spec coverage
Robert Speicher [Wed, 29 Aug 2012 15:58:33 +0000 (11:58 -0400)]
Fix milestone API specs and moved to requests/api
Closes #1331
Robert Speicher [Wed, 29 Aug 2012 15:36:02 +0000 (11:36 -0400)]
Add more coverage for model validations and associations
Dmitriy Zaporozhets [Wed, 29 Aug 2012 15:09:41 +0000 (18:09 +0300)]
Mark api milestone specs as pending
Robert Speicher [Wed, 29 Aug 2012 06:21:50 +0000 (02:21 -0400)]
Add is_within method for shoulda's EnsureLengthOf matcher
Robert Speicher [Wed, 29 Aug 2012 06:05:08 +0000 (02:05 -0400)]
Remove annotations from specs
Robert Speicher [Wed, 29 Aug 2012 05:52:19 +0000 (01:52 -0400)]
Move IssueCommonality and Upvote specs out of models and into their own specs
Robert Speicher [Wed, 29 Aug 2012 05:49:26 +0000 (01:49 -0400)]
Add `include_module` matcher
Robert Speicher [Wed, 29 Aug 2012 05:35:48 +0000 (01:35 -0400)]
Remove model specs that are covered by factories_spec
logiblocs [Wed, 29 Aug 2012 11:04:37 +0000 (13:04 +0200)]
Fixed one letter in doc/installation.md
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
randx [Wed, 29 Aug 2012 05:13:38 +0000 (08:13 +0300)]
Preview as button. Disable note submit unless content
Dmitriy Zaporozhets [Wed, 29 Aug 2012 12:47:54 +0000 (05:47 -0700)]
Merge pull request #1329 from tsigo/milestone_api_docs
Add milestone API docs to doc/README and views/help/api
Robert Speicher [Wed, 29 Aug 2012 12:45:00 +0000 (08:45 -0400)]
Add milestone API docs to doc/README and views/help/api
Also removes `closed` attribute option from create action.
Dmitriy Zaporozhets [Wed, 29 Aug 2012 12:36:01 +0000 (05:36 -0700)]
Merge pull request #1328 from NARKOZ/api
add docs for Milestones API
Dmitriy Zaporozhets [Wed, 29 Aug 2012 12:35:12 +0000 (15:35 +0300)]
Merge branch 'milestone_api' of https://github.com/tsigo/gitlabhq into tsigo-milestone_api
Conflicts:
spec/requests/api/issues_spec.rb
Nihad Abbasov [Wed, 29 Aug 2012 12:31:00 +0000 (05:31 -0700)]
add docs for Milestones API
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