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

3025 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets 048d47e626 Refactorn oauth & ldap 2012-09-12 09:23:16 +03:00
Dmitriy Zaporozhets 40eec08c99 Merge pull request #1409 from riyad/update-votes 
Update votes for issues and merge requests
 2012-09-11 23:08:19 -07:00
randx d8f6d38d39 Fix observer test 2012-09-12 09:05:12 +03:00
Dmitriy Zaporozhets fa4150d47d Cleanup after omniauth 2012-09-12 08:23:20 +03:00
Dmitriy Zaporozhets 486de8c3f4 Refactoring auth 2012-09-12 07:48:22 +03:00
Dmitriy Zaporozhets 621affecb5 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
 2012-09-12 06:49:52 +03:00
randx 0523b4265b Application logger 2012-09-11 23:24:53 +03:00
Riyad Preukschas 0bfcc574b6 Extract displaying votes into partials 2012-09-11 16:48:11 +02:00
Riyad Preukschas f7c70eaaed Add *votes_in_percent 2012-09-11 16:47:59 +02:00
Dmitriy Zaporozhets 4903910390 Merge pull request #1438 from SaitoWu/bugfix/1434 
tree view need use ascii-8bit, file name need be utf8.
 2012-09-11 05:43:56 -07:00
Dmitriy Zaporozhets 9fb595eb35 Merge pull request #1440 from NARKOZ/patch-tree 
don't load commit logs when viewing blob
 2012-09-11 05:43:02 -07:00
Nihad Abbasov 5a90712645 don't load commit logs when viewing blob 2012-09-11 05:35:16 -07:00
Saito 96d4f22e53 tree view need use ascii-8bit, file name need be utf8. 2012-09-11 19:18:14 +08:00
Dmitriy Zaporozhets 1c08cb404d Merge pull request #1424 from elvanja/issue-1343-empty-string-fix 
FIX: Empty string in commit message
 2012-09-11 00:08:51 -07:00
randx a2f7f48c03 Ask guard not to run all tests on start 2012-09-10 19:50:35 +03:00
Dmitriy Zaporozhets 3f01ec2d5b Merge pull request #1426 from NARKOZ/spinach 
Cucumber => Spinach
 2012-09-10 09:09:07 -07:00
Nihad Abbasov 79eb5ab396 refactor feature steps 2012-09-10 08:35:03 -07:00
Vanja Radovanović 7e2846fb57 using blank?, much shorter 2012-09-10 17:32:31 +02:00
miks 6d76e000d0 Add authorization to hooks requests 2012-09-10 16:50:01 +03:00
miks 2e34a6d3c4 Merge branch 'master' into project_hooks_api 2012-09-10 16:47:31 +03:00
Nihad Abbasov ef4e9c24d3 install guard-spinach 2012-09-10 06:43:49 -07:00
Dmitriy Zaporozhets 8674fba173 Merge pull request #1422 from AlexDenisov/api_errors_refactoring 
API errors refactoring
 2012-09-10 06:41:01 -07:00
Nihad Abbasov ae9689f8ff remove cucumber completely 2012-09-10 06:40:57 -07:00
Dmitriy Zaporozhets 263b8af1c4 Merge pull request #1423 from u-minor/fix_ldap_login 
Fix haml template error for ldap login.
 2012-09-10 06:39:21 -07:00
Nihad Abbasov b58155113b add spinach steps for remaining features 2012-09-10 06:35:23 -07:00
Vanja Radovanović 8d171a8cbc fixed commit title when commit message is an empty string and ensured that link_to_gfm helper doesn't break on nil body 2012-09-10 14:40:35 +02:00
Nihad Abbasov 698500dd78 add spinach steps for project issues and source features 2012-09-10 05:34:01 -07:00
Dmitriy Zaporozhets 5604613025 Merge pull request #1415 from tsigo/chosen_behavior 
Reduce the amount of JavaScript written in views
 2012-09-10 04:43:21 -07:00
Minoru NAKATA a3d22297dc fix haml template error for ldap login. 2012-09-10 20:40:20 +09:00
Nihad Abbasov 080bd12e16 rewrite project commits features using spinach 2012-09-10 04:27:11 -07:00
Alex Denisov e68d0841be Merge branch 'master' into api_errors_refactoring 2012-09-10 14:10:34 +03:00
Alex Denisov a065557208 Common errors method added 2012-09-10 13:49:00 +03:00
Nihad Abbasov 7aeb92b8e4 rewrite profile feature steps using spinach 2012-09-10 02:40:51 -07:00
Nihad Abbasov d74f54736b rewrite dashboard feature steps using spinach 2012-09-10 02:20:12 -07:00
Nihad Abbasov bb75052a90 get rid of cucumber step definitions 2012-09-10 00:53:15 -07:00
Nihad Abbasov 9f25657ad9 modify env file for spinach 2012-09-10 00:52:43 -07:00
Nihad Abbasov decb3abf18 install spinach-rails 2012-09-10 00:42:36 -07:00
Alex Denisov 915dac0055 Error throwing moved to api_helper 2012-09-10 10:41:46 +03:00
randx a839cb427c Fix require calls in gemfile 2012-09-10 09:43:30 +03:00
randx 8795f67f47 REmoved autotest, added notify libs for growl 2012-09-10 09:41:51 +03:00
randx a1ba470e4e Added guard 2012-09-10 09:26:35 +03:00
Alex Denisov 77bfc591bf Merge 'master' branch 2012-09-10 09:19:15 +03:00
Dmitriy Zaporozhets 52d29f5d59 Project team page improved 2012-09-10 09:14:37 +03:00
Dmitriy Zaporozhets 38c2cfb9ad Merge pull request #1417 from jouve/fix_typos 
fix typo
 2012-09-10 02:09:25 -07:00
Cyril e7f483f9f4 fix typo 2012-09-10 10:50:07 +02:00
Robert Speicher d6c384c20f 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.
 2012-09-10 02:12:36 -04:00
randx b565f33472 Auth for API 2012-09-10 09:06:11 +03:00
Dmitriy Zaporozhets 80685596d3 Merge pull request #1414 from AlexDenisov/team_member_events 
Team membership events
 2012-09-09 22:32:43 -07:00
Alex Denisov 1f240b09ed User left project event added 2012-09-10 00:27:47 +03:00
Alex Denisov a86bd87afc User joined project event added 2012-09-09 23:18:28 +03:00