OSDN Git Service
miks [Sat, 8 Sep 2012 17:54:58 +0000 (20:54 +0300)]
Merge branch 'master' into project_hooks_api
miks [Sat, 8 Sep 2012 17:51:12 +0000 (20:51 +0300)]
Projects hooks API implemented
miks [Sat, 8 Sep 2012 17:01:08 +0000 (20:01 +0300)]
Return empty body
miks [Sat, 8 Sep 2012 16:39:10 +0000 (19:39 +0300)]
fix failing tests
miks [Sat, 8 Sep 2012 14:51:28 +0000 (17:51 +0300)]
"users" GET test added
miks [Sat, 8 Sep 2012 14:40:36 +0000 (17:40 +0300)]
move "users" test after project tests
Valeriy Sizov [Sat, 8 Sep 2012 10:35:00 +0000 (13:35 +0300)]
New project form: spec for autocomplete
miks [Sat, 8 Sep 2012 09:37:23 +0000 (12:37 +0300)]
typo fixed
miks [Sat, 8 Sep 2012 07:50:24 +0000 (10:50 +0300)]
Merge branch 'master' into project_users_api
Dmitriy Zaporozhets [Sat, 8 Sep 2012 04:19:31 +0000 (21:19 -0700)]
Merge pull request #1406 from riyad/markdown-code-fixes
Markdown code fixes
Dmitriy Zaporozhets [Sat, 8 Sep 2012 04:17:42 +0000 (21:17 -0700)]
Merge pull request #1407 from riyad/add-emoji-docs
Add emoji docs
Riyad Preukschas [Fri, 7 Sep 2012 23:58:12 +0000 (01:58 +0200)]
Prevent gfm() to leak changes to the string supplied through the _text_ argument
Riyad Preukschas [Fri, 7 Sep 2012 22:49:17 +0000 (00:49 +0200)]
Fix bug where parsing of emoji was unnecessarily dependent on @project being set
Riyad Preukschas [Fri, 7 Sep 2012 23:11:32 +0000 (01:11 +0200)]
Remove unnecessary check in Markdown helper
Riyad Preukschas [Fri, 7 Sep 2012 23:08:07 +0000 (01:08 +0200)]
Add emoji docs to Markdown help
Riyad Preukschas [Fri, 7 Sep 2012 23:06:17 +0000 (01:06 +0200)]
Reorder blocks in Markdown help
Riyad Preukschas [Fri, 7 Sep 2012 20:14:17 +0000 (22:14 +0200)]
Fix Ruby anti-pattern in Markdown
Dmitriy Zaporozhets [Fri, 7 Sep 2012 18:10:27 +0000 (11:10 -0700)]
Merge pull request #1402 from AlexDenisov/preselected_milestone_while_create_new_issue
Preselected milestone and assignee while create new issue
Alex Denisov [Fri, 7 Sep 2012 17:59:12 +0000 (20:59 +0300)]
IssueController#new refactored
randx [Fri, 7 Sep 2012 17:47:52 +0000 (20:47 +0300)]
5xx error status code for gitolite & encoding error
randx [Fri, 7 Sep 2012 17:43:51 +0000 (20:43 +0300)]
gitolite -> more exceptions
randx [Fri, 7 Sep 2012 16:57:13 +0000 (19:57 +0300)]
projects helper added
Alex Denisov [Fri, 7 Sep 2012 14:20:20 +0000 (17:20 +0300)]
Merge branch 'master' into preselected_milestone_while_create_new_issue
Alex Denisov [Fri, 7 Sep 2012 14:03:38 +0000 (17:03 +0300)]
Cucumber tag removed
Alex Denisov [Fri, 7 Sep 2012 13:52:48 +0000 (16:52 +0300)]
Pre-selected assignee implemented
Alex Denisov [Fri, 7 Sep 2012 13:51:37 +0000 (16:51 +0300)]
Cucumber scenario on pre-selected assignee added
Alex Denisov [Fri, 7 Sep 2012 13:35:59 +0000 (16:35 +0300)]
Pre-selected milestone implemented
randx [Fri, 7 Sep 2012 12:36:40 +0000 (15:36 +0300)]
change gitolite backend behaviour to prevent error when config directory removed
Alex Denisov [Fri, 7 Sep 2012 10:56:13 +0000 (13:56 +0300)]
Preselected Milestone: Cucumber scenario added
Dmitriy Zaporozhets [Fri, 7 Sep 2012 07:44:44 +0000 (00:44 -0700)]
Merge pull request #1339 from chopmann/fix-import_bulk
fix bulk_import for #1309
Dmitriy Zaporozhets [Fri, 7 Sep 2012 07:42:41 +0000 (10:42 +0300)]
Change representation of team members. Group by role
Dmitriy Zaporozhets [Fri, 7 Sep 2012 06:50:35 +0000 (09:50 +0300)]
Bulk user add on project -> new team member
randx [Fri, 7 Sep 2012 06:16:04 +0000 (09:16 +0300)]
Fix emojii
Dmitriy Zaporozhets [Fri, 7 Sep 2012 06:15:30 +0000 (09:15 +0300)]
Refactor gitolite_config
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
Dmitriy Zaporozhets [Fri, 7 Sep 2012 05:16:29 +0000 (08:16 +0300)]
Split gitolite backend. Use gitolite_config methods moved to separate class
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".
miks [Thu, 6 Sep 2012 20:49:29 +0000 (23:49 +0300)]
Make project users API more RESTful
miks [Thu, 6 Sep 2012 20:14:42 +0000 (23:14 +0300)]
bulk access roles update/deletion added
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
miks [Thu, 6 Sep 2012 13:32:26 +0000 (16:32 +0300)]
Typo fixed
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
miks [Thu, 6 Sep 2012 07:20:59 +0000 (10:20 +0300)]
proper Grape params hash simulation
Cornelio [Thu, 30 Aug 2012 14:51:09 +0000 (16:51 +0200)]
fix bulk_import for #1309
miks [Thu, 6 Sep 2012 06:52:27 +0000 (09:52 +0300)]
Fix tests
randx [Thu, 6 Sep 2012 06:15:51 +0000 (09:15 +0300)]
Cucumber refactoring
miks [Wed, 5 Sep 2012 22:06:02 +0000 (01:06 +0300)]
count against last project
miks [Wed, 5 Sep 2012 21:13:25 +0000 (00:13 +0300)]
convert params hash to array
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!
miks [Wed, 5 Sep 2012 20:08:45 +0000 (23:08 +0300)]
Merge branch 'master' of git://github.com/gitlabhq/gitlabhq into project_users_api
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
miks [Wed, 5 Sep 2012 20:01:03 +0000 (23:01 +0300)]
API on adding users to project implemented
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