Commit graph

2454 commits

Author SHA1 Message Date
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
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
27e4436507 Return empty body 2012-09-08 20:01:08 +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
Riyad Preukschas
a5164ea2ed Show votes as a bar 2012-09-08 16:44:56 +02:00
miks
8a3408180a move "users" test after project tests 2012-09-08 17:40:36 +03:00
Riyad Preukschas
5ca31aa252 Make issue buttons look more consistent with MRs 2012-09-08 16:07:51 +02:00
Riyad Preukschas
1271b4ce66 Update display of merge requests and issues to also show downvotes 2012-09-08 16:07:44 +02: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
2e76342d72 typo fixed 2012-09-08 12:37:23 +03:00
miks
4226458faf Merge branch 'master' into project_users_api 2012-09-08 10:50:24 +03:00
Dmitriy Zaporozhets
7cc4b3f632 Merge pull request #1406 from riyad/markdown-code-fixes
Markdown code fixes
2012-09-07 21:19:31 -07:00
Dmitriy Zaporozhets
60ab3bea39 Merge pull request #1407 from riyad/add-emoji-docs
Add emoji docs
2012-09-07 21:17:42 -07:00
Riyad Preukschas
d661b893c5 Prevent gfm() to leak changes to the string supplied through the _text_ argument 2012-09-08 01:58:12 +02: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
Riyad Preukschas
9a4c22d395 Remove unnecessary check in Markdown helper 2012-09-08 01:11:32 +02:00