OSDN Git Service
Alex Denisov [Mon, 10 Sep 2012 06:19:15 +0000 (09:19 +0300)]
Merge 'master' branch
randx [Mon, 10 Sep 2012 06:06:11 +0000 (09:06 +0300)]
Auth for API
Dmitriy Zaporozhets [Mon, 10 Sep 2012 05:32:43 +0000 (22:32 -0700)]
Merge pull request #1414 from AlexDenisov/team_member_events
Team membership events
Alex Denisov [Sun, 9 Sep 2012 21:27:47 +0000 (00:27 +0300)]
User left project event added
Alex Denisov [Sun, 9 Sep 2012 20:18:28 +0000 (23:18 +0300)]
User joined project event added
Alex Denisov [Fri, 7 Sep 2012 07:23:45 +0000 (10:23 +0300)]
don't send notification when UsersProject destroyed
Alex Denisov [Fri, 7 Sep 2012 06:39:34 +0000 (09:39 +0300)]
Merge branch 'master' into fix_project_access_notification
randx [Fri, 7 Sep 2012 06:16:04 +0000 (09:16 +0300)]
Fix emojii
Dmitriy Zaporozhets [Fri, 7 Sep 2012 06:05:18 +0000 (23:05 -0700)]
Merge pull request #1384 from tsigo/emoji
Emoji!
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
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.
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
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
Robert Speicher [Thu, 6 Sep 2012 21:20:57 +0000 (17:20 -0400)]
Fix Help/Markdown: Take 2
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.
Robert Speicher [Thu, 6 Sep 2012 21:05:23 +0000 (17:05 -0400)]
Fix spec broken by
bde19c0
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".
Robert Speicher [Thu, 6 Sep 2012 19:31:25 +0000 (15:31 -0400)]
Update Note#upvote? to support emoji voting
Robert Speicher [Thu, 6 Sep 2012 19:26:55 +0000 (15:26 -0400)]
Simplify EMOJI_PATTERN
Robert Speicher [Thu, 6 Sep 2012 19:23:42 +0000 (15:23 -0400)]
Merge branch 'master' into emoji
Dmitriy Zaporozhets [Thu, 6 Sep 2012 15:11:41 +0000 (08:11 -0700)]
Merge pull request #1392 from NARKOZ/refactoring
refactor factory specs
Nihad Abbasov [Thu, 6 Sep 2012 14:56:33 +0000 (07:56 -0700)]
add missing selector to projects.js
Nihad Abbasov [Thu, 6 Sep 2012 14:52:01 +0000 (07:52 -0700)]
refactor factory specs
Dmitriy Zaporozhets [Thu, 6 Sep 2012 14:46:57 +0000 (17:46 +0300)]
Merge branch 'AlexDenisov-normalize_capitalization'
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
Dmitriy Zaporozhets [Thu, 6 Sep 2012 13:12:28 +0000 (06:12 -0700)]
Merge pull request #1391 from NARKOZ/refactoring
Refactoring
Nihad Abbasov [Thu, 6 Sep 2012 12:47:13 +0000 (05:47 -0700)]
move code from application.js to separate file
Nihad Abbasov [Thu, 6 Sep 2012 12:44:44 +0000 (05:44 -0700)]
cleanup projects.coffee
Nihad Abbasov [Thu, 6 Sep 2012 12:06:01 +0000 (05:06 -0700)]
delete unnecessary team.js
Nihad Abbasov [Thu, 6 Sep 2012 11:51:42 +0000 (04:51 -0700)]
rewrite snippets.js in coffeescript
Nihad Abbasov [Thu, 6 Sep 2012 11:37:14 +0000 (04:37 -0700)]
rewrite loader.js in coffeescript
Nihad Abbasov [Thu, 6 Sep 2012 11:32:31 +0000 (04:32 -0700)]
rewrite graph.js in coffeescript
Nihad Abbasov [Thu, 6 Sep 2012 11:32:01 +0000 (04:32 -0700)]
rewrite admin.js in coffeescript
Nihad Abbasov [Thu, 6 Sep 2012 11:03:46 +0000 (04:03 -0700)]
minor refactoring of commits controller
Alex Denisov [Thu, 6 Sep 2012 08:40:56 +0000 (11:40 +0300)]
Merge branch 'master' into normalize_capitalization
Alex Denisov [Thu, 6 Sep 2012 08:40:16 +0000 (11:40 +0300)]
Spec fixed
Alex Denisov [Thu, 6 Sep 2012 07:50:47 +0000 (10:50 +0300)]
Capitlization of /gitlab/i normalized. #1367
randx [Thu, 6 Sep 2012 06:15:51 +0000 (09:15 +0300)]
Cucumber refactoring
Sytse Sijbrandij [Wed, 5 Sep 2012 20:22:33 +0000 (22:22 +0200)]
Ignore chef dir.
Robert Speicher [Wed, 5 Sep 2012 20:14:54 +0000 (16:14 -0400)]
Set the size of emoji to be 20x20
Forgot they were so big!
Robert Speicher [Wed, 5 Sep 2012 20:07:39 +0000 (16:07 -0400)]
Change Gitlab::Markdown to a module; add emoji parsing
Robert Speicher [Wed, 5 Sep 2012 20:06:03 +0000 (16:06 -0400)]
Move the entire `gfm` method to Gitlab::Markdown, which will be a module now
Robert Speicher [Wed, 5 Sep 2012 20:05:20 +0000 (16:05 -0400)]
Add specs for parsing Emoji
Robert Speicher [Wed, 5 Sep 2012 20:04:41 +0000 (16:04 -0400)]
Add emoji image files
randx [Wed, 5 Sep 2012 20:00:10 +0000 (23:00 +0300)]
minor css improvements
Dmitriy Zaporozhets [Wed, 5 Sep 2012 11:07:35 +0000 (04:07 -0700)]
Merge pull request #1378 from NARKOZ/validations
validate boolean attributes
Nihad Abbasov [Wed, 5 Sep 2012 10:14:24 +0000 (03:14 -0700)]
add validations for boolean attributes
Nihad Abbasov [Wed, 5 Sep 2012 10:05:57 +0000 (03:05 -0700)]
bump shoulda-matchers
Alex Denisov [Wed, 5 Sep 2012 08:44:47 +0000 (11:44 +0300)]
Unnecessary code removed
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
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
Alex Denisov [Wed, 5 Sep 2012 06:20:02 +0000 (09:20 +0300)]
Unused routes removed
Dmitriy Zaporozhets [Wed, 5 Sep 2012 05:56:59 +0000 (08:56 +0300)]
Use tw style for some buttons. Improved deploy key UI
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.
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!
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
Robert Speicher [Wed, 5 Sep 2012 05:01:20 +0000 (01:01 -0400)]
Add Repository#discover_default_branch and add it to PushObserver
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.
Robert Speicher [Wed, 5 Sep 2012 03:57:39 +0000 (23:57 -0400)]
Add specs for Project#discover_default_branch
randx [Tue, 4 Sep 2012 17:50:00 +0000 (20:50 +0300)]
Cleaner install section for nginx, unicorn
randx [Tue, 4 Sep 2012 17:29:20 +0000 (20:29 +0300)]
cleanup gitlab from setup scripts
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
randx [Tue, 4 Sep 2012 16:44:17 +0000 (19:44 +0300)]
update install to use recipes
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
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.
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
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
Robert Speicher [Tue, 4 Sep 2012 15:30:49 +0000 (11:30 -0400)]
Rename projects.js to projects.js.coffee
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
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
Robert Speicher [Tue, 4 Sep 2012 09:26:25 +0000 (05:26 -0400)]
Clean up doc/installation.md
Closes #939
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.
Robert Speicher [Tue, 4 Sep 2012 09:03:31 +0000 (05:03 -0400)]
Change hardcoded base path to use Gitlab settings
Closes #1072
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
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
Rob Taylor [Tue, 14 Aug 2012 16:54:25 +0000 (17:54 +0100)]
Text changes to API documentation
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
Alex Denisov [Tue, 4 Sep 2012 07:29:26 +0000 (10:29 +0300)]
json_spec removed
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
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.
Alex Denisov [Tue, 4 Sep 2012 06:38:48 +0000 (09:38 +0300)]
json_spec added. Create project via REST API fixed
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
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
Robert Speicher [Tue, 4 Sep 2012 00:38:41 +0000 (20:38 -0400)]
Add Milestone link to API help TOC
[ci skip]
randx [Mon, 3 Sep 2012 19:57:34 +0000 (22:57 +0300)]
fix browse file css
randx [Mon, 3 Sep 2012 19:30:14 +0000 (22:30 +0300)]
git clone panel available on files tab too
Alex Denisov [Mon, 3 Sep 2012 19:20:29 +0000 (22:20 +0300)]
Merge branch 'master' into fix_project_access_notification
randx [Mon, 3 Sep 2012 18:53:16 +0000 (21:53 +0300)]
Tables refactored
Alex Denisov [Mon, 3 Sep 2012 18:46:17 +0000 (21:46 +0300)]
test_after_commit gem added
Alex Denisov [Mon, 3 Sep 2012 17:48:38 +0000 (20:48 +0300)]
After commit instead of after_update
Alex Denisov [Mon, 3 Sep 2012 15:02:43 +0000 (18:02 +0300)]
Merge branch 'master' into api_create_project_fixes
Alex Denisov [Mon, 3 Sep 2012 15:00:24 +0000 (18:00 +0300)]
Create project via API: fixes added
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:13:51 +0000 (08:13 +0300)]
devise session templates to haml. Fix problem with missing message in commit
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.