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

2740 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets
dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
Dmitriy Zaporozhets
8f9a450eed Merge pull request #1462 from pipozzz/master 
Repaired Get patch
 2012-09-14 07:05:21 -07:00
Peter Gonda
795cc9b716 Repaired Get patch 2012-09-14 15:57:25 +02:00
Dmitriy Zaporozhets
3ecc4df4b3 Merge pull request #1456 from tsigo/issue_1308 
Fix HTML entities being parsed in GFM
 2012-09-13 23:17:03 -07:00
Robert Speicher
d993f66642 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
 2012-09-13 15:20:00 -04:00
Dmitriy Zaporozhets
85def2d625 Merge pull request #1451 from tsigo/omniauth_settings 
Be more resilient in the case of missing omniauth settings
 2012-09-12 22:22:59 -07:00
Robert Speicher
0d77209ea0 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).
 2012-09-12 18:11:59 -04:00
Dmitriy Zaporozhets
3643df1f7c Merge pull request #1411 from miks/project_hooks_api 
Project hooks API
 2012-09-12 12:16:35 -07:00
Dmitriy Zaporozhets
6233fb6b5d Merge pull request #1446 from NARKOZ/refactoring 
specs DRY up
 2012-09-12 09:08:42 -07:00
randx
4782163c7a Use default tw thubmnails 2012-09-12 19:06:32 +03:00
randx
9329dfbfc5 Show inline providers icons on login page 2012-09-12 19:01:52 +03:00
randx
acc5302c3f improve profile layout after omniauth changes 2012-09-12 18:56:44 +03:00
Nihad Abbasov
b6f249dc1f make API specs more organized and readable 2012-09-12 05:11:56 -07:00
Nihad Abbasov
a87c268f7d remove duplicate code from atom request specs 2012-09-12 05:01:50 -07:00
Dmitriy Zaporozhets
64f026b254 Merge branch 'funglaub-master' 2012-09-12 09:24:30 +03:00
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