OSDN Git Service

wvm/gitlab.git
11 years agoMerge pull request #1363 from AlexDenisov/api_create_project_fixes
Dmitriy Zaporozhets [Fri, 7 Sep 2012 06:00:04 +0000 (23:00 -0700)]
Merge pull request #1363 from AlexDenisov/api_create_project_fixes

API create project fixes

11 years agoMerge pull request #1385 from dosire/ignore_chef_dir
Dmitriy Zaporozhets [Fri, 7 Sep 2012 05:58:10 +0000 (22:58 -0700)]
Merge pull request #1385 from dosire/ignore_chef_dir

Ignore chef dir.

11 years agoMerge pull request #1397 from tsigo/fix_markdown_help
Dmitriy Zaporozhets [Fri, 7 Sep 2012 05:48:00 +0000 (22:48 -0700)]
Merge pull request #1397 from tsigo/fix_markdown_help

Fix Markdown help page

11 years agoadd mysql service for travis-ci
Nihad Abbasov [Fri, 7 Sep 2012 01:01:04 +0000 (07:01 +0600)]
add mysql service for travis-ci

see http://about.travis-ci.org/blog/august-2012-upcoming-ci-environment-updates

11 years agoFix Help/Markdown: Take 2
Robert Speicher [Thu, 6 Sep 2012 21:20:57 +0000 (17:20 -0400)]
Fix Help/Markdown: Take 2

11 years agoRevert "Change @project instance variable to a local in views/help/markdown"
Robert Speicher [Thu, 6 Sep 2012 21:17:56 +0000 (17:17 -0400)]
Revert "Change @project instance variable to a local in views/help/markdown"

This reverts commit 6471d8c6521ef7a88f3aa893cc11c1da8077bdc0.

11 years agoFix spec broken by bde19c0
Robert Speicher [Thu, 6 Sep 2012 21:05:23 +0000 (17:05 -0400)]
Fix spec broken by bde19c0

11 years agoUpdate failure message for UsersProject uniqueness validation
Robert Speicher [Thu, 6 Sep 2012 20:51:28 +0000 (16:51 -0400)]
Update failure message for UsersProject uniqueness validation

Was "User has already been taken", is now "User already exists in
project".

11 years agoMerge pull request #1392 from NARKOZ/refactoring
Dmitriy Zaporozhets [Thu, 6 Sep 2012 15:11:41 +0000 (08:11 -0700)]
Merge pull request #1392 from NARKOZ/refactoring

refactor factory specs

11 years agoadd missing selector to projects.js
Nihad Abbasov [Thu, 6 Sep 2012 14:56:33 +0000 (07:56 -0700)]
add missing selector to projects.js

11 years agorefactor factory specs
Nihad Abbasov [Thu, 6 Sep 2012 14:52:01 +0000 (07:52 -0700)]
refactor factory specs

11 years agoMerge branch 'AlexDenisov-normalize_capitalization'
Dmitriy Zaporozhets [Thu, 6 Sep 2012 14:46:57 +0000 (17:46 +0300)]
Merge branch 'AlexDenisov-normalize_capitalization'

11 years agoMerge branch 'normalize_capitalization' of https://github.com/AlexDenisov/gitlabhq...
Dmitriy Zaporozhets [Thu, 6 Sep 2012 14:36:04 +0000 (17:36 +0300)]
Merge branch 'normalize_capitalization' of https://github.com/AlexDenisov/gitlabhq into AlexDenisov-normalize_capitalization

11 years agoMerge pull request #1391 from NARKOZ/refactoring
Dmitriy Zaporozhets [Thu, 6 Sep 2012 13:12:28 +0000 (06:12 -0700)]
Merge pull request #1391 from NARKOZ/refactoring

Refactoring

11 years agomove code from application.js to separate file
Nihad Abbasov [Thu, 6 Sep 2012 12:47:13 +0000 (05:47 -0700)]
move code from application.js to separate file

11 years agocleanup projects.coffee
Nihad Abbasov [Thu, 6 Sep 2012 12:44:44 +0000 (05:44 -0700)]
cleanup projects.coffee

11 years agodelete unnecessary team.js
Nihad Abbasov [Thu, 6 Sep 2012 12:06:01 +0000 (05:06 -0700)]
delete unnecessary team.js

11 years agorewrite snippets.js in coffeescript
Nihad Abbasov [Thu, 6 Sep 2012 11:51:42 +0000 (04:51 -0700)]
rewrite snippets.js in coffeescript

11 years agorewrite loader.js in coffeescript
Nihad Abbasov [Thu, 6 Sep 2012 11:37:14 +0000 (04:37 -0700)]
rewrite loader.js in coffeescript

11 years agorewrite graph.js in coffeescript
Nihad Abbasov [Thu, 6 Sep 2012 11:32:31 +0000 (04:32 -0700)]
rewrite graph.js in coffeescript

11 years agorewrite admin.js in coffeescript
Nihad Abbasov [Thu, 6 Sep 2012 11:32:01 +0000 (04:32 -0700)]
rewrite admin.js in coffeescript

11 years agominor refactoring of commits controller
Nihad Abbasov [Thu, 6 Sep 2012 11:03:46 +0000 (04:03 -0700)]
minor refactoring of commits controller

11 years agoMerge branch 'master' into normalize_capitalization
Alex Denisov [Thu, 6 Sep 2012 08:40:56 +0000 (11:40 +0300)]
Merge branch 'master' into normalize_capitalization

11 years agoSpec fixed
Alex Denisov [Thu, 6 Sep 2012 08:40:16 +0000 (11:40 +0300)]
Spec fixed

11 years agoCapitlization of /gitlab/i normalized. #1367
Alex Denisov [Thu, 6 Sep 2012 07:50:47 +0000 (10:50 +0300)]
Capitlization of /gitlab/i normalized. #1367

11 years agoCucumber refactoring
randx [Thu, 6 Sep 2012 06:15:51 +0000 (09:15 +0300)]
Cucumber refactoring

11 years agoIgnore chef dir.
Sytse Sijbrandij [Wed, 5 Sep 2012 20:22:33 +0000 (22:22 +0200)]
Ignore chef dir.

11 years agominor css improvements
randx [Wed, 5 Sep 2012 20:00:10 +0000 (23:00 +0300)]
minor css improvements

11 years agoMerge pull request #1378 from NARKOZ/validations
Dmitriy Zaporozhets [Wed, 5 Sep 2012 11:07:35 +0000 (04:07 -0700)]
Merge pull request #1378 from NARKOZ/validations

validate boolean attributes

11 years agoadd validations for boolean attributes
Nihad Abbasov [Wed, 5 Sep 2012 10:14:24 +0000 (03:14 -0700)]
add validations for boolean attributes

11 years agobump shoulda-matchers
Nihad Abbasov [Wed, 5 Sep 2012 10:05:57 +0000 (03:05 -0700)]
bump shoulda-matchers

11 years agoUnnecessary code removed
Alex Denisov [Wed, 5 Sep 2012 08:44:47 +0000 (11:44 +0300)]
Unnecessary code removed

11 years agoMerge pull request #1375 from tsigo/discover_default_branch
Dmitriy Zaporozhets [Wed, 5 Sep 2012 07:04:56 +0000 (00:04 -0700)]
Merge pull request #1375 from tsigo/discover_default_branch

Default branch auto-discovery

11 years agoMerge pull request #1376 from AlexDenisov/remove_unused_routes
Dmitriy Zaporozhets [Wed, 5 Sep 2012 06:59:43 +0000 (23:59 -0700)]
Merge pull request #1376 from AlexDenisov/remove_unused_routes

Unused routes removed

11 years agoUnused routes removed
Alex Denisov [Wed, 5 Sep 2012 06:20:02 +0000 (09:20 +0300)]
Unused routes removed

11 years agoUse tw style for some buttons. Improved deploy key UI
Dmitriy Zaporozhets [Wed, 5 Sep 2012 05:56:59 +0000 (08:56 +0300)]
Use tw style for some buttons. Improved deploy key UI

11 years agoMove load_refs out of ApplicationController and into CommitsController
Robert Speicher [Wed, 5 Sep 2012 05:13:41 +0000 (01:13 -0400)]
Move load_refs out of ApplicationController and into CommitsController

That was the only place it was used.

11 years agoFix load_refs in ApplicationController after default_branch change
Robert Speicher [Wed, 5 Sep 2012 05:12:44 +0000 (01:12 -0400)]
Fix load_refs in ApplicationController after default_branch change

As a last resort it was calling a method that didn't exist. Woops!

11 years agoAdd specs for a couple more Repository methods used by discover_default_branch
Robert Speicher [Wed, 5 Sep 2012 05:02:30 +0000 (01:02 -0400)]
Add specs for a couple more Repository methods used by discover_default_branch

11 years agoAdd Repository#discover_default_branch and add it to PushObserver
Robert Speicher [Wed, 5 Sep 2012 05:01:20 +0000 (01:01 -0400)]
Add Repository#discover_default_branch and add it to PushObserver

11 years agoAdd SetDefaultBranchDefaultToNil migration
Robert Speicher [Wed, 5 Sep 2012 05:00:07 +0000 (01:00 -0400)]
Add SetDefaultBranchDefaultToNil migration

default_branch now defaults to nil, not 'master'. It will be set after the first
push by discover_default_branch.

11 years agoAdd specs for Project#discover_default_branch
Robert Speicher [Wed, 5 Sep 2012 03:57:39 +0000 (23:57 -0400)]
Add specs for Project#discover_default_branch

11 years agoCleaner install section for nginx, unicorn
randx [Tue, 4 Sep 2012 17:50:00 +0000 (20:50 +0300)]
Cleaner install section for nginx, unicorn

11 years agocleanup gitlab from setup scripts
randx [Tue, 4 Sep 2012 17:29:20 +0000 (20:29 +0300)]
cleanup gitlab from setup scripts

11 years agoMerge pull request #1371 from tsigo/project_panel
Dmitriy Zaporozhets [Tue, 4 Sep 2012 17:00:00 +0000 (10:00 -0700)]
Merge pull request #1371 from tsigo/project_panel

Refactor the project clone panel

11 years agoupdate install to use recipes
randx [Tue, 4 Sep 2012 16:44:17 +0000 (19:44 +0300)]
update install to use recipes

11 years agoChange projects/empty to include the clone_panel partial instead of duplicating
Robert Speicher [Tue, 4 Sep 2012 16:05:08 +0000 (12:05 -0400)]
Change projects/empty to include the clone_panel partial instead of duplicating

11 years agoRemove projects/_show partial
Robert Speicher [Tue, 4 Sep 2012 16:03:40 +0000 (12:03 -0400)]
Remove projects/_show partial

I have no earthly idea what this file was for, but I couldn't find it being
rendered anywhere.

11 years agoAdd "empty_repo?" method to Repository role
Robert Speicher [Tue, 4 Sep 2012 15:37:38 +0000 (11:37 -0400)]
Add "empty_repo?" method to Repository role

Replaces two calls that this method simplifies

11 years agoUpdate the projects js file to coffeescript; refactor the clone panel switcher
Robert Speicher [Tue, 4 Sep 2012 15:36:14 +0000 (11:36 -0400)]
Update the projects js file to coffeescript; refactor the clone panel switcher

11 years agoRename projects.js to projects.js.coffee
Robert Speicher [Tue, 4 Sep 2012 15:30:49 +0000 (11:30 -0400)]
Rename projects.js to projects.js.coffee

11 years agoMerge pull request #1368 from tsigo/tmp_gitkeep
Dmitriy Zaporozhets [Tue, 4 Sep 2012 10:03:37 +0000 (03:03 -0700)]
Merge pull request #1368 from tsigo/tmp_gitkeep

Add tmp/.gitkeep file to ensure tmp folder exists on clone

11 years agoMerge pull request #1369 from tsigo/installation_doc
Dmitriy Zaporozhets [Tue, 4 Sep 2012 10:03:24 +0000 (03:03 -0700)]
Merge pull request #1369 from tsigo/installation_doc

Clean up doc/installation.md

11 years agoClean up doc/installation.md
Robert Speicher [Tue, 4 Sep 2012 09:26:25 +0000 (05:26 -0400)]
Clean up doc/installation.md

Closes #939

11 years agoAdd tmp/.gitkeep file to ensure tmp folder exists on clone
Robert Speicher [Tue, 4 Sep 2012 09:24:43 +0000 (05:24 -0400)]
Add tmp/.gitkeep file to ensure tmp folder exists on clone

The install guide lists it as a requirement, so we might as well have it
by default.

11 years agoChange hardcoded base path to use Gitlab settings
Robert Speicher [Tue, 4 Sep 2012 09:03:31 +0000 (05:03 -0400)]
Change hardcoded base path to use Gitlab settings

Closes #1072

11 years agoMerge pull request #1233 from robbytaylor/master
Valeriy Sizov [Tue, 4 Sep 2012 08:52:37 +0000 (01:52 -0700)]
Merge pull request #1233 from robbytaylor/master

Changes to text in API documentation

11 years agoMerge pull request #1361 from tsechingho/master
Valeriy Sizov [Tue, 4 Sep 2012 08:50:28 +0000 (01:50 -0700)]
Merge pull request #1361 from tsechingho/master

use APP_ROOT in init-gitlab to specify root of project

11 years agoText changes to API documentation
Rob Taylor [Tue, 14 Aug 2012 16:54:25 +0000 (17:54 +0100)]
Text changes to API documentation

11 years agouse APP_ROOT in init-gitlab to specify root of project
Tse-Ching Ho [Mon, 3 Sep 2012 13:04:10 +0000 (21:04 +0800)]
use APP_ROOT in init-gitlab to specify root of project

11 years agojson_spec removed
Alex Denisov [Tue, 4 Sep 2012 07:29:26 +0000 (10:29 +0300)]
json_spec removed

11 years agoMerge pull request #1366 from tsigo/markdown_help
Dmitriy Zaporozhets [Tue, 4 Sep 2012 07:28:04 +0000 (00:28 -0700)]
Merge pull request #1366 from tsigo/markdown_help

Change @project instance variable to a local in views/help/markdown

11 years agoChange @project instance variable to a local in views/help/markdown
Robert Speicher [Tue, 4 Sep 2012 07:18:26 +0000 (03:18 -0400)]
Change @project instance variable to a local in views/help/markdown

It was erroneously appending the project name to the page's title, even
though the Help system isn't specific to one project.

11 years agojson_spec added. Create project via REST API fixed
Alex Denisov [Tue, 4 Sep 2012 06:38:48 +0000 (09:38 +0300)]
json_spec added. Create project via REST API fixed

11 years agoMerge pull request #1365 from tsigo/gitolite_identifier
Dmitriy Zaporozhets [Tue, 4 Sep 2012 06:14:19 +0000 (23:14 -0700)]
Merge pull request #1365 from tsigo/gitolite_identifier

Update User#identifier to conform to Gitolite 2.x's user pattern

11 years agoUpdate User#identifier to conform to Gitolite 2.x's user pattern
Robert Speicher [Tue, 4 Sep 2012 04:04:36 +0000 (00:04 -0400)]
Update User#identifier to conform to Gitolite 2.x's user pattern

Also modifies the specs a bit because I can't help myself.

Closes #480

11 years agoAdd Milestone link to API help TOC
Robert Speicher [Tue, 4 Sep 2012 00:38:41 +0000 (20:38 -0400)]
Add Milestone link to API help TOC

[ci skip]

11 years agofix browse file css
randx [Mon, 3 Sep 2012 19:57:34 +0000 (22:57 +0300)]
fix browse file css

11 years agogit clone panel available on files tab too
randx [Mon, 3 Sep 2012 19:30:14 +0000 (22:30 +0300)]
git clone panel available on files tab too

11 years agoTables refactored
randx [Mon, 3 Sep 2012 18:53:16 +0000 (21:53 +0300)]
Tables refactored

11 years agoMerge branch 'master' into api_create_project_fixes
Alex Denisov [Mon, 3 Sep 2012 15:02:43 +0000 (18:02 +0300)]
Merge branch 'master' into api_create_project_fixes

11 years agoCreate project via API: fixes added
Alex Denisov [Mon, 3 Sep 2012 15:00:24 +0000 (18:00 +0300)]
Create project via API: fixes added

11 years agoMerge pull request #1360 from NARKOZ/api
Dmitriy Zaporozhets [Mon, 3 Sep 2012 12:04:23 +0000 (05:04 -0700)]
Merge pull request #1360 from NARKOZ/api

API pagination

11 years agoadd pagination to API
Nihad Abbasov [Mon, 3 Sep 2012 11:46:29 +0000 (04:46 -0700)]
add pagination to API

11 years agoadd kaminari config with default and max per_page values
Nihad Abbasov [Mon, 3 Sep 2012 11:22:49 +0000 (04:22 -0700)]
add kaminari config with default and max per_page values

11 years agobump kaminari
Nihad Abbasov [Mon, 3 Sep 2012 10:43:19 +0000 (03:43 -0700)]
bump kaminari

11 years agoMerge pull request #1347 from AlexDenisov/api_project_creation
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

11 years agodevise session templates to haml. Fix problem with missing message in commit
Dmitriy Zaporozhets [Mon, 3 Sep 2012 05:13:51 +0000 (08:13 +0300)]
devise session templates to haml. Fix problem with missing message in commit

11 years agoMerge pull request #1356 from dosire/non-interactive-aws-install
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.

11 years agoUpdate 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.

11 years agoMerge pull request #1327 from logiblocs/master
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

11 years agoMerge pull request #1318 from dosire/non-interactive-aws-install
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

11 years agoMerge pull request #1351 from tsigo/nonrelative_resque
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

11 years agoMerge pull request #1355 from tsigo/gfm_spec_cleanup
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

11 years agoRedesign gfm helper specs
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.

11 years agoAdd link_title to CommitDecorator
Robert Speicher [Sun, 2 Sep 2012 03:56:44 +0000 (23:56 -0400)]
Add link_title to CommitDecorator

11 years agoAdd StaticModel role, and add it to Commit model
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, ...)

11 years agoMerge branch 'master' into non-interactive-aws-install
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

11 years agoNon-interactive AWS install by running a single script.
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

11 years agoNon-interactive AWS install by running a single script.
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.

11 years agoFix glm by adding id and classes to sanitize white attrs
randx [Sun, 2 Sep 2012 12:25:54 +0000 (15:25 +0300)]
Fix glm by adding id and classes to sanitize white attrs

11 years agoRename gitlab_flavored_markdown_spec to gitlab_markdown_helper_spec
Robert Speicher [Sun, 2 Sep 2012 02:56:54 +0000 (22:56 -0400)]
Rename gitlab_flavored_markdown_spec to gitlab_markdown_helper_spec

11 years agoSanitize glm helper
randx [Sat, 1 Sep 2012 20:35:04 +0000 (23:35 +0300)]
Sanitize glm helper

11 years agoFew fixes for ~ 1000px resolution
randx [Sat, 1 Sep 2012 19:21:28 +0000 (22:21 +0300)]
Few fixes for ~ 1000px resolution

11 years agoGive Resque route a name and use that for the iframe src
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

11 years agoMerge branch 'master' into api_project_creation
Alex Denisov [Fri, 31 Aug 2012 08:26:12 +0000 (11:26 +0300)]
Merge branch 'master' into api_project_creation

11 years agoTypo and mistakes fixed
Alex Denisov [Fri, 31 Aug 2012 08:11:12 +0000 (11:11 +0300)]
Typo and mistakes fixed

11 years agoMerge pull request #1326 from AlexDenisov/issue_status_changed_notifications
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

11 years agoJSON for new project removed from API docs
Alex Denisov [Fri, 31 Aug 2012 07:28:38 +0000 (10:28 +0300)]
JSON for new project removed from API docs

11 years agoDocs changed for Create Project API
Alex Denisov [Fri, 31 Aug 2012 07:27:45 +0000 (10:27 +0300)]
Docs changed for Create Project API