Riyad Preukschas
|
3022786948
|
Merge commit 'master' into discussions
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
|
2013-01-15 00:52:25 +01:00 |
|
Dmitriy Zaporozhets
|
2f6603e581
|
A bit of spinach tests
|
2013-01-09 08:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
dccd8b6eaa
|
Continue refactoring. Use repostory and team
|
2013-01-04 08:43:25 +02:00 |
|
Andrey Kumanyaev
|
25c5763780
|
Add functional in user section
|
2012-12-26 19:52:15 +04:00 |
|
|
Riyad Preukschas
|
0b3df2f128
|
Add merge request note feature
|
2012-12-03 22:51:55 +01:00 |
|
|
Dmitriy Zaporozhets
|
46bf3a0949
|
Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax
|
2012-12-02 13:29:24 +02:00 |
|
|
randx
|
3e04673334
|
Added feature test for stats
|
2012-11-10 23:33:10 +02:00 |
|
|
randx
|
f082c8ae2a
|
Decouple and refactor GraphCommit
|
2012-11-04 23:43:33 +02:00 |
|
Robert Speicher
|
b1be377fb0
|
Add Spinach feature for Commit breadcrumbs
|
2012-11-01 17:57:44 -04:00 |
|
Dmitriy Zaporozhets
|
2032f4cd96
|
Fix tests fail cause of issue with grit stub
|
2012-10-31 15:22:13 +02:00 |
|
|
randx
|
42abdf69d5
|
More group tests with spinach
|
2012-10-22 21:42:06 +03:00 |
|
|
randx
|
db69836319
|
Move ProjectHooks from spec/requests to spinach
|
2012-09-27 23:52:08 +03:00 |
|
|
Robert Speicher
|
b462a13387
|
Compare views and cleanup
- Remove compare/_head and just use commits/_head since they're identical
- Add index view; extract the form into a partial
|
2012-09-26 16:32:24 -04:00 |
|
|
Robert Speicher
|
4252ea90c0
|
Add feature steps for a generic, non-"Shop" project
This group is better for features that only deal with one project.
|
2012-09-26 16:32:24 -04:00 |
|
|
Robert Speicher
|
cada511f8b
|
Add features for checking the "Active Tab" across various pages
|
2012-09-26 16:32:24 -04:00 |
|
|
Robert Speicher
|
f814da38bf
|
Limit commit history to 5 in Spinach
Speeds things up a bit
|
2012-09-26 16:32:23 -04:00 |
|
|
Robert Speicher
|
1048917232
|
Update usages of project_commit[s] route helpers
|
2012-09-26 16:32:23 -04:00 |
|
|
Robert Speicher
|
79a02df92e
|
Update usages of tree_file_project_ref_path to project_tree_path
|
2012-09-26 16:32:21 -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 |
|
|
Dmitriy Zaporozhets
|
dc37c8aaae
|
Refactored profile area
|
2012-09-14 19:13:25 +03:00 |
|
Nihad Abbasov
|
79eb5ab396
|
refactor feature steps
|
2012-09-10 08:35:03 -07:00 |
|