Dan Knox
ea9b3687db
Replace current Wiki system with Gollum Wikis.
...
This commit replaces the old database backed Wiki system with the
excellent Gollum git based Wiki system.
The UI has been updated to allow for utilizing the extra features
that Gollum provides. Specifically:
* Edit page now allows you to choose the content format.
* Edit page allows you to provide a commit message for the change.
* History page now shows Format, Commit Message, and Commit Hash.
* A new Git Access page has been added with the Wiki Repo URL.
* The default page has been changed to Home from Index to match
the Gollum standard.
The old Wiki model has been left in tact to provide for the
development of a migration script that will move all content stored
in the old Wiki system into new Gollum Wikis.
2013-03-09 16:39:51 -08:00
Sebastian Ziebell
61cfa2a7a6
Merge branch 'master' into fixes/api
...
Conflicts:
lib/api/projects.rb
2013-03-05 22:29:49 +01:00
Andrew8xx8
0d9a6fe7b1
User's blocked field refactored to use state machine
2013-03-04 18:52:30 +04:00
Andrew8xx8
0afdf39dbc
New field added
2013-02-28 16:11:13 +04:00
Andrew8xx8
68a7ecdaaf
Project issue tracker functions refactored
2013-02-28 16:10:00 +04:00
Sebastian Ziebell
ac4a09e9cc
Merge branch 'master' into fixes/api
2013-02-27 10:16:48 +01:00
Dmitriy Zaporozhets
9c252a60c1
remove tests for unexisting methods
2013-02-26 11:17:02 +02:00
Dmitriy Zaporozhets
d7b667fee2
Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2
...
Conflicts:
app/models/merge_request.rb
2013-02-26 10:38:40 +02:00
Dmitriy Zaporozhets
7bab81b199
Move git post push logic to service
2013-02-25 21:21:38 +02:00
Andrew8xx8
e2d94e0719
State machine added for merge_status field
2013-02-20 17:49:48 +04:00
Sebastian Ziebell
512d826cc3
API: fixes test if project limit is reached
...
Fixes a test that checks if the project limit is reached.
2013-02-20 14:15:04 +01:00
Dmitriy Zaporozhets
155703c613
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
...
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
2013-02-19 11:01:19 +02:00
Andrew8xx8
41e97a766b
Creating test values moved to before
2013-02-18 17:52:39 +04:00
Andrew8xx8
69698aacbc
Additional tests added to Issue
2013-02-18 14:43:50 +04:00
Andrew8xx8
b607c70e8f
Additional tests added to Milestone
2013-02-18 14:43:50 +04:00
Andrew8xx8
1644117a1a
Issue uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
0b512af803
Milestone uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
b45e9aefd3
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
f97296597c
Issuable consern uses StateMachine now
2013-02-18 14:43:49 +04:00
Andrew8xx8
8db3920c01
State renamed to merge_status
2013-02-18 14:43:49 +04:00
Jaakko Kantojärvi
27f4cf7542
Tests to validate that invalid keys are rejected
2013-02-17 21:31:20 +02:00
Andrew8xx8
839957cf56
Constants in Events looks good now
2013-02-13 15:48:16 +04:00
Dmitriy Zaporozhets
ab0cfc0036
fixing tests after refactoring
2013-02-11 20:28:27 +02:00
Dmitriy Zaporozhets
d09d87e3b0
fix deploy key spec
2013-02-07 10:25:47 +02:00
Dmitriy Zaporozhets
70e3bffd95
Fixed: post-receive, project remove, tests
2013-02-05 12:47:50 +02:00
Dmitriy Zaporozhets
193a5624b2
add path and path_with_namespace to api project entity
2013-01-31 09:11:35 +02:00
Dmitriy Zaporozhets
bd94854929
fix tests
2013-01-28 08:59:34 +02:00
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
b8dadd6427
repair rspec (remove and rename files)
2013-01-24 22:31:25 +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
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
Dmitriy Zaporozhets
b059de2ac7
Fix notes model specs
2013-01-15 15:19:14 +02: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
Dmitriy Zaporozhets
9773ccc451
sidekiq with green tests
2013-01-09 09:14:05 +03: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
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
d6036f08aa
move activated? method to service
2013-01-03 09:52:14 +02:00
Dmitriy Zaporozhets
ce84e3f440
Fixed tests. added test for gitlab_ci_service model
2013-01-03 09:37:13 +02:00
Dmitriy Zaporozhets
e65731bb7e
Add concerns to autoload
2013-01-03 09:12:24 +02:00
