Dmitriy Zaporozhets
|
aa1f1eb680
|
Merge pull request #2746 from gitlabhq/features/teams
New feature: Teams
|
2013-01-25 00:46:20 -08:00 |
|
|
Dmitriy Zaporozhets
|
3ce79e0658
|
fix spec
|
2013-01-25 10:10:12 +02:00 |
|
Andrey Kumanyaev
|
690db9693f
|
fix tests
|
2013-01-24 22:31:48 +02:00 |
|
|
Andrey Kumanyaev
|
eb99feb4a7
|
simple refactoring
|
2013-01-24 22:31:48 +02:00 |
|
|
Andrey Kumanyaev
|
a5ce8696a6
|
remove unused autogenerated files
|
2013-01-24 22:31:48 +02:00 |
|
|
Andrey Kumanyaev
|
1dd0feacc7
|
move Team_members controller into project (conflicts with team/members controller)
|
2013-01-24 22:31:25 +02:00 |
|
|
Andrey Kumanyaev
|
497f7ab5ba
|
save autogenerated files
|
2013-01-24 22:31:25 +02:00 |
|
|
Andrey Kumanyaev
|
b8dadd6427
|
repair rspec (remove and rename files)
|
2013-01-24 22:31:25 +02:00 |
|
|
Andrey Kumanyaev
|
cca9935970
|
save generated files
|
2013-01-24 22:31:24 +02:00 |
|
|
Andrey Kumanyaev
|
c5f427b0a4
|
save commit
|
2013-01-24 22:31:24 +02:00 |
|
|
Andrey Kumanyaev
|
17e9207dff
|
add user team factories
|
2013-01-24 22:31:24 +02:00 |
|
|
Andrey Kumanyaev
|
8a86fe7bb0
|
Added UserTeam core models (team and m-t-m relationships) and updated other models
|
2013-01-24 22:31:23 +02:00 |
|
Jun Futagawa
|
79b9249ff4
|
Remove relative_url_root from path. Fixes #2602
Files and Commits render a 404 when running with relative_url_root.
|
2013-01-23 17:29:46 +09:00 |
|
Valeriy Sizov
|
e982a9512e
|
fix tests
|
2013-01-22 17:25:35 +02:00 |
|
|
Dmitriy Zaporozhets
|
3a1022e381
|
Increase Issue description size to 10k. Fixes #2545
|
2013-01-19 12:09:23 +02:00 |
|
|
Dmitriy Zaporozhets
|
6f05ea4f6e
|
Improve CreateContext call. Fixed test
|
2013-01-18 20:21:13 +02:00 |
|
Marin Jankovski
|
296cdd591f
|
Add optional signup.
|
2013-01-18 11:57:31 +01:00 |
|
Riyad Preukschas
|
886cf2f5be
|
Fix GFM specs
|
2013-01-17 02:00:09 +01:00 |
|
|
Riyad Preukschas
|
2bc78739a7
|
Fix parsing of ref-like Urls in links and images in GFM
Fixes #2166
|
2013-01-16 22:39:56 +01:00 |
|
|
Riyad Preukschas
|
16b5417842
|
Use image Urls for Emoji in GFM
Fixes #2617
|
2013-01-16 22:39:45 +01:00 |
|
|
Riyad Preukschas
|
7635afd0c4
|
Use Urls for references in GFM
|
2013-01-16 22:08:01 +01:00 |
|
|
Dmitriy Zaporozhets
|
fd522b3257
|
should be green build now :)
|
2013-01-15 19:18:52 +02:00 |
|
|
Dmitriy Zaporozhets
|
cc54c66fd0
|
Fix spec/requests/notes_on_merge_requests_spec.r
|
2013-01-15 18:20:58 +02:00 |
|
|
Dmitriy Zaporozhets
|
752eb2c11d
|
more tests fixed
|
2013-01-15 16:36:35 +02:00 |
|
|
Dmitriy Zaporozhets
|
b059de2ac7
|
Fix notes model specs
|
2013-01-15 15:19:14 +02:00 |
|
|
Dmitriy Zaporozhets
|
2191efd8ec
|
fix notes_on_wall specs
|
2013-01-15 15:04:22 +02:00 |
|
|
Dmitriy Zaporozhets
|
ac983319d3
|
fixing some test
|
2013-01-15 12:42:54 +02:00 |
|
|
Riyad Preukschas
|
d28176b132
|
Replace commit diff note request specs with spinach features
|
2013-01-15 00:52:57 +01:00 |
|
|
Riyad Preukschas
|
f8e1f4a7c9
|
Replace commit note request specs with spinach features
|
2013-01-15 00:52:55 +01:00 |
|
|
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 |
|
|
Riyad Preukschas
|
8ee5fce9d6
|
Add preliminary specs for notes on merge requests
|
2013-01-15 00:27:59 +01:00 |
|
|
Riyad Preukschas
|
74e48f070f
|
Smaller fixes
|
2013-01-15 00:27:26 +01:00 |
|
|
Dmitriy Zaporozhets
|
9773ccc451
|
sidekiq with green tests
|
2013-01-09 09:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
2f6603e581
|
A bit of spinach tests
|
2013-01-09 08:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
31e3dc600a
|
Fix routing specs
|
2013-01-09 09:47:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
92a619ad28
|
organize simplecov
|
2013-01-07 22:23:13 +02:00 |
|
|
Riyad Preukschas
|
8c604c9d31
|
Add specs for notes on wall
|
2013-01-05 22:58:36 +01:00 |
|
|
Riyad Preukschas
|
1883e0830c
|
Add specs for notes on commits
|
2013-01-05 22:58:27 +01:00 |
|
|
Dmitriy Zaporozhets
|
5a214ee6f1
|
Remove unused methods
|
2013-01-05 13:11:15 +02:00 |
|
|
Dmitriy Zaporozhets
|
e3d7ce2cc4
|
Tests are fixed now
|
2013-01-05 12:12:02 +02:00 |
|
|
Dmitriy Zaporozhets
|
de6fa5dd52
|
Fix security spec
|
2013-01-05 00:49:43 +02:00 |
|
|
Dmitriy Zaporozhets
|
9a88e4d184
|
Fix some tests. Use travis-ci 1.9.2
|
2013-01-05 00:43:32 +02:00 |
|
|
Dmitriy Zaporozhets
|
e16cebac3e
|
Fixed styles, ProjectHook specs etc
|
2013-01-05 00:35:38 +02:00 |
|
|
Dmitriy Zaporozhets
|
c6298678f5
|
use ui-box as for all
|
2013-01-04 23:35:31 +02:00 |
|
|
Dmitriy Zaporozhets
|
ef5b36eaaf
|
Fixed protected branches and file edit
|
2013-01-04 21:45:30 +02:00 |
|
|
Dmitriy Zaporozhets
|
afbdbb0c95
|
Rspec fixes
|
2013-01-04 18:50:31 +02:00 |
|
|
Dmitriy Zaporozhets
|
dccd8b6eaa
|
Continue refactoring. Use repostory and team
|
2013-01-04 08:43:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
39ba934c0a
|
REpostiry, Team models
|
2013-01-03 21:09:18 +02:00 |
|
|
Dmitriy Zaporozhets
|
e6c0673ef1
|
Rspec models Milestone, Commit, UsersProject
|
2013-01-03 19:11:14 +02:00 |
|
|
Dmitriy Zaporozhets
|
2095780f24
|
fix tests
|
2013-01-03 12:37:12 +02:00 |
|