Alex Denisov
e6ce47291b
master merged
2012-09-20 10:25:29 +03:00
Robert Speicher
496f88afe1
Escape text passed to gfm by link_to_gfm
2012-09-19 19:42:26 -04:00
Robert Speicher
01974185a1
Simplify is_within matcher
...
[ci skip]
2012-09-19 12:14:42 -04:00
Alex Denisov
b6c6a5b159
Merge branch 'master' into ssh_keys_api
2012-09-16 22:37:50 +03:00
Robert Speicher
f4b14494ef
Move project-related routing specs to their own file
2012-09-16 12:42:52 -04:00
Alex Denisov
87d40fd276
Docs added
2012-09-16 18:21:59 +03:00
Alex Denisov
c23eb40829
SSH Keys API implemented
2012-09-16 17:52:06 +03:00
Robert Speicher
02b24cefc7
Missed a use of team_project_path
2012-09-16 10:38:01 -04:00
Robert Speicher
95bd93fe1a
Remove Projects#team action
...
Uses TeamMembers#index instead, to be more RESTful
2012-09-16 10:07:06 -04:00
Robert Speicher
83f24de352
Add routing specs
2012-09-16 10:06:21 -04:00
randx
a82977c648
A bit of test refactoring
2012-09-15 01:00:59 +03:00
Dmitriy Zaporozhets
dc37c8aaae
Refactored profile area
2012-09-14 19:13:25 +03: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
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
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
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
Riyad Preukschas
f7c70eaaed
Add *votes_in_percent
2012-09-11 16:47:59 +02:00
miks
2e34a6d3c4
Merge branch 'master' into project_hooks_api
2012-09-10 16:47:31 +03:00
Alex Denisov
a065557208
Common errors method added
2012-09-10 13:49:00 +03:00
Alex Denisov
77bfc591bf
Merge 'master' branch
2012-09-10 09:19:15 +03: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
miks
fdb5c82c33
Merge branch 'master' into project_hooks_api
2012-09-08 20:54:58 +03:00
miks
3b5a90bdf6
Projects hooks API implemented
2012-09-08 20:51:12 +03:00
miks
499ff8b441
fix failing tests
2012-09-08 19:39:10 +03:00
miks
0d1009af85
"users" GET test added
2012-09-08 17:51:28 +03:00
miks
8a3408180a
move "users" test after project tests
2012-09-08 17:40:36 +03:00
Riyad Preukschas
7b0c7ae52c
Add votes_count
2012-09-08 16:05:48 +02:00
Riyad Preukschas
2e0d5c2250
Add downvotes
2012-09-08 16:05:48 +02:00
Riyad Preukschas
a2a0060034
Rename Upvote role to Votes
2012-09-08 16:05:48 +02:00
Riyad Preukschas
06c1a8a9ae
Make notes recognize downvotes
2012-09-08 16:05:48 +02:00
Valeriy Sizov
cc7c6d5396
New project form: spec for autocomplete
2012-09-08 13:35:00 +03:00
miks
4226458faf
Merge branch 'master' into project_users_api
2012-09-08 10:50:24 +03:00
Riyad Preukschas
ce3fb94939
Fix bug where parsing of emoji was unnecessarily dependent on @project being set
2012-09-08 01:11:44 +02:00
Alex Denisov
ed4fbcf6b0
Merge branch 'master' into fix_project_access_notification
2012-09-07 09:39:34 +03:00
Dmitriy Zaporozhets
4f8a4aa44c
Merge pull request #1384 from tsigo/emoji
...
Emoji!
2012-09-06 23:05:18 -07:00
Dmitriy Zaporozhets
7c0a1068bf
Merge pull request #1363 from AlexDenisov/api_create_project_fixes
...
API create project fixes
2012-09-06 23:00:04 -07:00
Dmitriy Zaporozhets
79021e674b
Split gitolite backend. Use gitolite_config methods moved to separate class
2012-09-07 08:16:29 +03:00
Robert Speicher
8f3b1d6ea4
Fix spec broken by bde19c0
2012-09-06 17:05:23 -04:00
miks
909c8c345d
Make project users API more RESTful
2012-09-06 23:49:29 +03:00
Robert Speicher
2faa4bba40
Update Note#upvote? to support emoji voting
2012-09-06 15:31:25 -04:00
Robert Speicher
8808c5fa8d
Merge branch 'master' into emoji
2012-09-06 15:23:42 -04:00
Dmitriy Zaporozhets
a595f8944a
Merge pull request #1392 from NARKOZ/refactoring
...
refactor factory specs
2012-09-06 08:11:41 -07:00
Nihad Abbasov
d861023cb9
refactor factory specs
2012-09-06 07:52:01 -07:00
Alex Denisov
562af7a6a2
Merge branch 'master' into normalize_capitalization
2012-09-06 11:40:56 +03:00
