OSDN Git Service
Robert Speicher [Sun, 16 Sep 2012 11:22:46 +0000 (07:22 -0400)]
1.9 Hash syntax in routes.rb
Also cleans up some alignment and removes unnecessary "to: " arguments
Robert Speicher [Sun, 16 Sep 2012 08:51:26 +0000 (04:51 -0400)]
Limit admin/logs and admin/resque routes to the actions that are used
Robert Speicher [Sun, 16 Sep 2012 08:05:13 +0000 (04:05 -0400)]
Don't instantiate Resque::Server in routes
It still works, and it cleans up the output of `rake routes`.
randx [Sun, 16 Sep 2012 10:39:49 +0000 (13:39 +0300)]
Update installation doc with branch names
Dmitriy Zaporozhets [Sun, 16 Sep 2012 07:35:09 +0000 (00:35 -0700)]
Merge pull request #1471 from PragTob/renameUnicorn.rb
Rename: unicorn.rb.orig --> unicorn.rb.example
Nihad Abbasov [Sat, 15 Sep 2012 20:11:24 +0000 (13:11 -0700)]
Merge pull request #1473 from PragTob/updateDevDoc
Updated development docs
Tobias Pfeiffer [Sat, 15 Sep 2012 19:53:45 +0000 (21:53 +0200)]
The project doesn't use cucumber(anymore?), it uses spinach
Tobias Pfeiffer [Sat, 15 Sep 2012 19:52:01 +0000 (21:52 +0200)]
the rake was missing in fron of the gitlab:test task
Tobias Pfeiffer [Sat, 15 Sep 2012 19:23:41 +0000 (21:23 +0200)]
added the name change to the installation.md - thanks and nice catch to @NARKOZ
Tobias Pfeiffer [Sat, 15 Sep 2012 18:26:08 +0000 (20:26 +0200)]
Renamed unicorn.rb.orig to unicorn.rb.example since this seems to be more in line with the common used naming in the config directory. Plus seeing *.orig files I think of the leftovers of git merges, which left me puzzled for quite some time.
randx [Sat, 15 Sep 2012 06:58:34 +0000 (09:58 +0300)]
Merge branch 'riyad-change-notes-order'
randx [Sat, 15 Sep 2012 06:58:16 +0000 (09:58 +0300)]
Init mr comments when naviagate via ajax to diff
randx [Sat, 15 Sep 2012 06:49:21 +0000 (09:49 +0300)]
Fix MR diff comments. Fix wiki comments loading error
randx [Fri, 14 Sep 2012 22:02:58 +0000 (01:02 +0300)]
Merge branch 'change-notes-order' of https://github.com/riyad/gitlabhq into riyad-change-notes-order
randx [Fri, 14 Sep 2012 22:00:59 +0000 (01:00 +0300)]
A bit of test refactoring
Riyad Preukschas [Fri, 14 Sep 2012 15:01:34 +0000 (17:01 +0200)]
Update Notes JS for reversed notes
Riyad Preukschas [Fri, 14 Sep 2012 15:00:48 +0000 (17:00 +0200)]
Add 'notes/reversed_notes_with_form' partial
Riyad Preukschas [Fri, 14 Sep 2012 03:56:12 +0000 (05:56 +0200)]
Rename note.js to notes.js
Riyad Preukschas [Fri, 14 Sep 2012 14:57:08 +0000 (16:57 +0200)]
Extract 'notes/per_line_notes_with_reply' partial
Riyad Preukschas [Fri, 14 Sep 2012 15:02:09 +0000 (17:02 +0200)]
Extract 'notes/per_line_note_link' partial
Riyad Preukschas [Fri, 14 Sep 2012 03:21:58 +0000 (05:21 +0200)]
Rename 'notes/per_line_show' partial to 'notes/per_line_note'
Riyad Preukschas [Fri, 14 Sep 2012 03:19:38 +0000 (05:19 +0200)]
Renamed 'notes/notes_list' partial to 'notes/notes'
Riyad Preukschas [Fri, 14 Sep 2012 03:13:26 +0000 (05:13 +0200)]
Rename 'notes/show' partial to 'notes/note'
Riyad Preukschas [Fri, 14 Sep 2012 03:10:06 +0000 (05:10 +0200)]
Rename 'notes/reply_button' partial to 'notes/per_line_reply_button'
Riyad Preukschas [Fri, 14 Sep 2012 03:08:40 +0000 (05:08 +0200)]
Rename 'notes/form' partial to 'notes/common_form'
Riyad Preukschas [Fri, 14 Sep 2012 03:05:37 +0000 (05:05 +0200)]
Remove 'notes/load' partial
Riyad Preukschas [Fri, 14 Sep 2012 03:00:21 +0000 (05:00 +0200)]
Rename 'notes/create_*' partials
Riyad Preukschas [Fri, 14 Sep 2012 02:59:55 +0000 (04:59 +0200)]
Rename 'notes/notes' partial to 'notes/notes_with_form'
Riyad Preukschas [Thu, 13 Sep 2012 23:32:55 +0000 (01:32 +0200)]
Update JS for adding and removing diff line notes
Riyad Preukschas [Thu, 13 Sep 2012 23:22:09 +0000 (01:22 +0200)]
Update links for inline comments to use data-* attributes
Riyad Preukschas [Thu, 13 Sep 2012 23:21:39 +0000 (01:21 +0200)]
Update diff comments order and rendering
Riyad Preukschas [Fri, 14 Sep 2012 14:52:24 +0000 (16:52 +0200)]
Completely redo loading of notes with JS
Riyad Preukschas [Thu, 13 Sep 2012 17:55:57 +0000 (19:55 +0200)]
Fix markup
Riyad Preukschas [Thu, 13 Sep 2012 13:43:16 +0000 (15:43 +0200)]
Update Note to load notes in the right order
Riyad Preukschas [Thu, 13 Sep 2012 00:12:44 +0000 (02:12 +0200)]
Reorder notes view elements
randx [Fri, 14 Sep 2012 15:58:16 +0000 (18:58 +0300)]
Fixed token feature
randx [Fri, 14 Sep 2012 15:46:40 +0000 (18:46 +0300)]
fix event issue when event for left project + project removed
Dmitriy Zaporozhets [Fri, 14 Sep 2012 16:13:25 +0000 (19:13 +0300)]
Refactored profile area
Dmitriy Zaporozhets [Fri, 14 Sep 2012 14:05:21 +0000 (07:05 -0700)]
Merge pull request #1462 from pipozzz/master
Repaired Get patch
Peter Gonda [Fri, 14 Sep 2012 13:57:25 +0000 (15:57 +0200)]
Repaired Get patch
Dmitriy Zaporozhets [Fri, 14 Sep 2012 06:17:03 +0000 (23:17 -0700)]
Merge pull request #1456 from tsigo/issue_1308
Fix HTML entities being parsed in GFM
Robert Speicher [Thu, 13 Sep 2012 19:20:00 +0000 (15:20 -0400)]
Fix HTML entities being parsed in GFM
Also fixes the spec so that it actually tests the thing it says it's
testing. Hooray!
Closes #1308
Dmitriy Zaporozhets [Thu, 13 Sep 2012 05:22:59 +0000 (22:22 -0700)]
Merge pull request #1451 from tsigo/omniauth_settings
Be more resilient in the case of missing omniauth settings
Robert Speicher [Wed, 12 Sep 2012 22:11:59 +0000 (18:11 -0400)]
Be more resilient in the case of missing omniauth settings
Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).
Dmitriy Zaporozhets [Wed, 12 Sep 2012 19:16:35 +0000 (12:16 -0700)]
Merge pull request #1411 from miks/project_hooks_api
Project hooks API
Dmitriy Zaporozhets [Wed, 12 Sep 2012 16:08:42 +0000 (09:08 -0700)]
Merge pull request #1446 from NARKOZ/refactoring
specs DRY up
randx [Wed, 12 Sep 2012 16:06:32 +0000 (19:06 +0300)]
Use default tw thubmnails
randx [Wed, 12 Sep 2012 16:01:52 +0000 (19:01 +0300)]
Show inline providers icons on login page
randx [Wed, 12 Sep 2012 15:56:44 +0000 (18:56 +0300)]
improve profile layout after omniauth changes
Nihad Abbasov [Wed, 12 Sep 2012 12:11:56 +0000 (05:11 -0700)]
make API specs more organized and readable
Nihad Abbasov [Wed, 12 Sep 2012 12:01:50 +0000 (05:01 -0700)]
remove duplicate code from atom request specs
Dmitriy Zaporozhets [Wed, 12 Sep 2012 06:24:30 +0000 (09:24 +0300)]
Merge branch 'funglaub-master'
Dmitriy Zaporozhets [Wed, 12 Sep 2012 06:23:16 +0000 (09:23 +0300)]
Refactorn oauth & ldap
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
Dmitriy Zaporozhets [Wed, 12 Sep 2012 05:23:20 +0000 (08:23 +0300)]
Cleanup after omniauth
Dmitriy Zaporozhets [Wed, 12 Sep 2012 04:48:22 +0000 (07:48 +0300)]
Refactoring auth
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
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
miks [Mon, 10 Sep 2012 13:50:01 +0000 (16:50 +0300)]
Add authorization to hooks requests
miks [Mon, 10 Sep 2012 13:47:31 +0000 (16:47 +0300)]
Merge branch 'master' into project_hooks_api
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