OSDN Git Service
Dmitriy Zaporozhets [Wed, 12 Sep 2012 03:49:52 +0000 (06:49 +0300)]
Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master
Conflicts:
Gemfile.lock
app/helpers/application_helper.rb
app/views/devise/sessions/new.html.erb
db/schema.rb
Dmitriy Zaporozhets [Wed, 12 Sep 2012 06:08:19 +0000 (23:08 -0700)]
Merge pull request #1409 from riyad/update-votes
Update votes for issues and merge requests
randx [Wed, 12 Sep 2012 06:05:12 +0000 (09:05 +0300)]
Fix observer test
randx [Tue, 11 Sep 2012 20:24:53 +0000 (23:24 +0300)]
Application logger
Riyad Preukschas [Mon, 10 Sep 2012 13:27:14 +0000 (15:27 +0200)]
Extract displaying votes into partials
Riyad Preukschas [Tue, 11 Sep 2012 14:47:59 +0000 (16:47 +0200)]
Add *votes_in_percent
Dmitriy Zaporozhets [Tue, 11 Sep 2012 12:43:56 +0000 (05:43 -0700)]
Merge pull request #1438 from SaitoWu/bugfix/1434
tree view need use ascii-8bit, file name need be utf8.
Dmitriy Zaporozhets [Tue, 11 Sep 2012 12:43:02 +0000 (05:43 -0700)]
Merge pull request #1440 from NARKOZ/patch-tree
don't load commit logs when viewing blob
Nihad Abbasov [Tue, 11 Sep 2012 12:35:16 +0000 (05:35 -0700)]
don't load commit logs when viewing blob
Saito [Tue, 11 Sep 2012 11:18:14 +0000 (19:18 +0800)]
tree view need use ascii-8bit, file name need be utf8.
Dmitriy Zaporozhets [Tue, 11 Sep 2012 07:08:51 +0000 (00:08 -0700)]
Merge pull request #1424 from elvanja/issue-1343-empty-string-fix
FIX: Empty string in commit message
randx [Mon, 10 Sep 2012 16:50:35 +0000 (19:50 +0300)]
Ask guard not to run all tests on start
Dmitriy Zaporozhets [Mon, 10 Sep 2012 16:09:07 +0000 (09:09 -0700)]
Merge pull request #1426 from NARKOZ/spinach
Cucumber => Spinach
Nihad Abbasov [Mon, 10 Sep 2012 15:35:03 +0000 (08:35 -0700)]
refactor feature steps
Vanja Radovanović [Mon, 10 Sep 2012 15:32:31 +0000 (17:32 +0200)]
using blank?, much shorter
Nihad Abbasov [Mon, 10 Sep 2012 13:43:49 +0000 (06:43 -0700)]
install guard-spinach
Dmitriy Zaporozhets [Mon, 10 Sep 2012 13:41:01 +0000 (06:41 -0700)]
Merge pull request #1422 from AlexDenisov/api_errors_refactoring
API errors refactoring
Nihad Abbasov [Mon, 10 Sep 2012 13:40:57 +0000 (06:40 -0700)]
remove cucumber completely
Dmitriy Zaporozhets [Mon, 10 Sep 2012 13:39:21 +0000 (06:39 -0700)]
Merge pull request #1423 from u-minor/fix_ldap_login
Fix haml template error for ldap login.
Nihad Abbasov [Mon, 10 Sep 2012 13:35:23 +0000 (06:35 -0700)]
add spinach steps for remaining features
Vanja Radovanović [Mon, 10 Sep 2012 12:40:35 +0000 (14:40 +0200)]
fixed commit title when commit message is an empty string and ensured that link_to_gfm helper doesn't break on nil body
Nihad Abbasov [Mon, 10 Sep 2012 12:34:01 +0000 (05:34 -0700)]
add spinach steps for project issues and source features
Dmitriy Zaporozhets [Mon, 10 Sep 2012 11:43:21 +0000 (04:43 -0700)]
Merge pull request #1415 from tsigo/chosen_behavior
Reduce the amount of JavaScript written in views
Minoru NAKATA [Mon, 10 Sep 2012 11:35:09 +0000 (20:35 +0900)]
fix haml template error for ldap login.
Nihad Abbasov [Mon, 10 Sep 2012 11:27:11 +0000 (04:27 -0700)]
rewrite project commits features using spinach
Alex Denisov [Mon, 10 Sep 2012 11:10:34 +0000 (14:10 +0300)]
Merge branch 'master' into api_errors_refactoring
Alex Denisov [Mon, 10 Sep 2012 10:49:00 +0000 (13:49 +0300)]
Common errors method added
Nihad Abbasov [Mon, 10 Sep 2012 09:40:51 +0000 (02:40 -0700)]
rewrite profile feature steps using spinach
Nihad Abbasov [Mon, 10 Sep 2012 08:51:02 +0000 (01:51 -0700)]
rewrite dashboard feature steps using spinach
Nihad Abbasov [Mon, 10 Sep 2012 07:53:15 +0000 (00:53 -0700)]
get rid of cucumber step definitions
Nihad Abbasov [Mon, 10 Sep 2012 07:52:43 +0000 (00:52 -0700)]
modify env file for spinach
Nihad Abbasov [Mon, 10 Sep 2012 07:42:36 +0000 (00:42 -0700)]
install spinach-rails
Alex Denisov [Mon, 10 Sep 2012 07:41:46 +0000 (10:41 +0300)]
Error throwing moved to api_helper
randx [Mon, 10 Sep 2012 06:43:30 +0000 (09:43 +0300)]
Fix require calls in gemfile
randx [Mon, 10 Sep 2012 06:41:51 +0000 (09:41 +0300)]
REmoved autotest, added notify libs for growl
randx [Mon, 10 Sep 2012 06:26:35 +0000 (09:26 +0300)]
Added guard
Dmitriy Zaporozhets [Mon, 10 Sep 2012 06:13:45 +0000 (09:13 +0300)]
Project team page improved
Dmitriy Zaporozhets [Mon, 10 Sep 2012 09:09:25 +0000 (02:09 -0700)]
Merge pull request #1417 from jouve/fix_typos
fix typo
Cyril [Mon, 10 Sep 2012 08:50:07 +0000 (10:50 +0200)]
fix typo
Robert Speicher [Mon, 10 Sep 2012 06:09:55 +0000 (02:09 -0400)]
Reduce the amount of JavaScript written in views
Seeing `:javascript` all over Views feels like a code smell. This goes a
long way towards reducing the amount of JS in views, but there's still
plenty to be done on that front.
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
Riyad Preukschas [Sat, 8 Sep 2012 14:44:56 +0000 (16:44 +0200)]
Show votes as a bar
Riyad Preukschas [Sat, 8 Sep 2012 14:00:38 +0000 (16:00 +0200)]
Make issue buttons look more consistent with MRs
Riyad Preukschas [Sat, 8 Sep 2012 01:30:41 +0000 (03:30 +0200)]
Update display of merge requests and issues to also show downvotes
Riyad Preukschas [Sat, 8 Sep 2012 00:37:29 +0000 (02:37 +0200)]
Add votes_count
Riyad Preukschas [Sat, 8 Sep 2012 00:30:47 +0000 (02:30 +0200)]
Add downvotes
Riyad Preukschas [Sat, 8 Sep 2012 00:23:49 +0000 (02:23 +0200)]
Rename Upvote role to Votes
Riyad Preukschas [Sat, 8 Sep 2012 00:08:35 +0000 (02:08 +0200)]
Make notes recognize downvotes
Valeriy Sizov [Sat, 8 Sep 2012 10:35:00 +0000 (13:35 +0300)]
New project form: spec for autocomplete
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".
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