deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2268 commits 6 branches 43 tags 25 MiB
Commit graph

2268 commits

This branch
This branch
All branches
Author SHA1 Message Date
Valeriy Sizov 97ea041246 Merge pull request #1233 from robbytaylor/master 
Changes to text in API documentation
 2012-09-04 01:52:37 -07:00
Valeriy Sizov e398e96b7c Merge pull request #1361 from tsechingho/master 
use APP_ROOT in init-gitlab to specify root of project
 2012-09-04 01:50:28 -07:00
Rob Taylor 4cb03183ac Text changes to API documentation 2012-09-04 09:48:33 +01:00
Tse-Ching Ho 457b0f604f use APP_ROOT in init-gitlab to specify root of project 2012-09-04 16:39:10 +08:00
Alex Denisov 4bd3024580 json_spec removed 2012-09-04 10:29:26 +03:00
Dmitriy Zaporozhets c347fd3f88 Merge pull request #1366 from tsigo/markdown_help 
Change @project instance variable to a local in views/help/markdown
 2012-09-04 00:28:04 -07:00
Robert Speicher 6471d8c652 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.
 2012-09-04 03:18:26 -04:00
Alex Denisov b73d4419ea json_spec added. Create project via REST API fixed 2012-09-04 09:38:48 +03:00
Dmitriy Zaporozhets cb2b888bd6 Merge pull request #1365 from tsigo/gitolite_identifier 
Update User#identifier to conform to Gitolite 2.x's user pattern
 2012-09-03 23:14:19 -07:00
Robert Speicher d29827433d 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
 2012-09-04 00:20:17 -04:00
Robert Speicher b44e9a08d5 Add Milestone link to API help TOC 
[ci skip]
 2012-09-03 20:38:41 -04:00
randx 5db2dbdcf1 fix browse file css 2012-09-03 22:57:34 +03:00
randx f557686eb2 git clone panel available on files tab too 2012-09-03 22:30:14 +03:00
randx 8ca0b75d05 Tables refactored 2012-09-03 21:53:16 +03:00
Alex Denisov 6b3ce96a19 Merge branch 'master' into api_create_project_fixes 2012-09-03 18:02:43 +03:00
Alex Denisov e078a173d6 Create project via API: fixes added 2012-09-03 18:00:24 +03:00
Dmitriy Zaporozhets 0c5e556922 Merge pull request #1360 from NARKOZ/api 
API pagination
 2012-09-03 05:04:23 -07:00
Nihad Abbasov 76e4d94d43 add pagination to API 2012-09-03 04:46:29 -07:00
Nihad Abbasov 6817a6a295 add kaminari config with default and max per_page values 2012-09-03 04:22:49 -07:00
Nihad Abbasov 6745812c72 bump kaminari 2012-09-03 03:43:19 -07:00
Dmitriy Zaporozhets cc03600b22 Merge pull request #1347 from AlexDenisov/api_project_creation 
API for new project creation
 2012-09-03 01:48:51 -07:00
Dmitriy Zaporozhets c7cfe3d83b devise session templates to haml. Fix problem with missing message in commit 2012-09-03 08:15:07 +03:00
Dmitriy Zaporozhets 6ec909cfd0 Merge pull request #1356 from dosire/non-interactive-aws-install 
Update the references to the script and refer to it from the installation manual.
 2012-09-02 22:11:30 -07:00
Sytse Sijbrandij cc137bba79 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.
 2012-09-02 22:44:11 +02:00
Dmitriy Zaporozhets 734a5b7d02 Merge pull request #1327 from logiblocs/master 
Trivial fix to docs/installation.md
 2012-09-02 12:21:00 -07:00
Dmitriy Zaporozhets 65402f1a1a Merge pull request #1318 from dosire/non-interactive-aws-install 
Non interactive aws install
 2012-09-02 12:09:48 -07:00
Dmitriy Zaporozhets 6997543ac2 Merge pull request #1351 from tsigo/nonrelative_resque 
Give Resque route a name and use that for the iframe src
 2012-09-02 11:58:13 -07:00
Dmitriy Zaporozhets f9711cd81a Merge pull request #1355 from tsigo/gfm_spec_cleanup 
GFM spec redesign
 2012-09-02 11:57:33 -07:00
Robert Speicher ef24576fc2 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.
 2012-09-02 13:40:14 -04:00
Robert Speicher 40d619107f Add link_title to CommitDecorator 2012-09-02 13:40:14 -04:00
Robert Speicher 8db2a59d0b 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, ...)
 2012-09-02 13:40:07 -04:00
Sytse Sijbrandij 0c59904715 Merge branch 'master' into non-interactive-aws-install 
Conflicts:
	doc/installation.md
 2012-09-02 18:41:33 +02:00
Sytse Sijbrandij b80dd3d242 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
 2012-09-02 18:39:50 +02:00
Sytse Sijbrandij eae41ad1df 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.
 2012-09-02 18:29:46 +02:00
randx aecbd313bc Fix glm by adding id and classes to sanitize white attrs 2012-09-02 15:25:54 +03:00
Robert Speicher 877aa54586 Rename gitlab_flavored_markdown_spec to gitlab_markdown_helper_spec 2012-09-02 02:45:18 -04:00
randx beb5e1bd6b Sanitize glm helper 2012-09-01 23:35:04 +03:00
randx adeeae9f73 Few fixes for ~ 1000px resolution 2012-09-01 22:21:28 +03:00
Robert Speicher 0de5d08e37 Give Resque route a name and use that for the iframe src 
Closes #1350
 2012-08-31 19:28:32 -04:00
Florian Unglaub 0dd94cd86e DRY'ed up the user model 2012-08-31 16:44:23 +02:00
Florian Unglaub 1b0198f1d3 save newly created users directly in the model 2012-08-31 16:24:12 +02:00
Florian Unglaub 6d6c7a17ea Allow single-sign-on with Omniauth 2012-08-31 15:45:50 +02:00
Alex Denisov 2bd1682ab4 Merge branch 'master' into api_project_creation 2012-08-31 11:26:12 +03:00
Alex Denisov 9811e64d71 Typo and mistakes fixed 2012-08-31 11:11:12 +03:00
Dmitriy Zaporozhets ed954ebae2 Merge pull request #1326 from AlexDenisov/issue_status_changed_notifications 
Issue status changed notifications
 2012-08-31 00:51:31 -07:00
Alex Denisov acac1547a0 JSON for new project removed from API docs 2012-08-31 10:28:38 +03:00
Alex Denisov b6a0407e7a Docs changed for Create Project API 2012-08-31 10:27:45 +03:00
Alex Denisov 985ecf0f04 Docs added for Create Project API 2012-08-31 10:25:36 +03:00
Alex Denisov c1173e2707 API on Projects creation implemented 2012-08-31 10:15:37 +03:00
randx 65abd8b20a Freeze project path in admin area 2012-08-31 09:05:44 +03:00