Dmitriy Zaporozhets
71ab011a17
Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis
...
Conflicts:
app/views/layouts/project_resource.html.haml
app/views/wikis/edit.html.haml
app/views/wikis/pages.html.haml
app/views/wikis/show.html.haml
spec/features/gitlab_flavored_markdown_spec.rb
2013-03-15 16:55:07 +02:00
Dmitriy Zaporozhets
86e23a584a
spianch -> profile -> specify within block
2013-03-15 16:05:07 +02:00
Dmitriy Zaporozhets
39bbdc468f
on wall subpage active tab should be wiki too
2013-03-15 09:39:50 +02:00
Dmitriy Zaporozhets
753ecbdcec
Change spinach tab tests to fit new tabs navigation
2013-03-14 21:51:44 +02:00
Dmitriy Zaporozhets
d2b882fae5
Fix spinach tests
2013-03-14 17:13:00 +02:00
Dmitriy Zaporozhets
88d42c2e1c
Replace projects_box with ui-box. Fixed team spinach test
2013-03-14 13:12:11 +02:00
Dmitriy Zaporozhets
ef05423f47
Finish select2-ajax for users. Added Select2Helper for tests
2013-03-14 10:16:27 +02:00
Dmitriy Zaporozhets
963c212b68
UserTeam spinach fixed
2013-03-13 22:30:33 +02:00
Dmitriy Zaporozhets
496b7da7a0
Fix spinach tests
2013-03-13 21:58:32 +02:00
Dmitriy Zaporozhets
fa9a8c3847
Remove team_member show page -> use user_path instead
2013-03-13 19:16:36 +02:00
Dmitriy Zaporozhets
f1c24f40f9
fix spinach after #3196
2013-03-12 14:10:20 +02:00
Andrew8xx8
fce22dfa2f
Tests for dashboard projects fixed
2013-03-12 15:15:14 +04:00
Andrew8xx8
804ae05c58
Tests improved
2013-03-12 13:41:23 +04:00
Dan Knox
1479f17227
Add Spinach coverage for Gollum Wiki system and correct the Delete link.
...
The previously failing Spinach steps have been fixed with this commit.
I have also added new steps that cover the entire usage of the Wiki
system.
The new Spinach steps revealed a minor bug in the Delete page process.
The path for the "Delete this page" button was previously set to
`project_wikis_page(@project, @wiki)` when it should have been
using the singular `project_wiki_page(@project, @wiki)` path helper.
The link has been corrected and all steps are now passing.
2013-03-10 14:59:20 -07:00
Dmitriy Zaporozhets
96fbef60f9
add coveralls.io to travis builds
2013-03-10 20:26:27 +02:00
Dmitriy Zaporozhets
473efc82b6
Group and team rss is valid now
2013-03-10 12:16:57 +02:00
Sato Hiroyuki
e03a018d28
Refactor: rename module and class names.
...
* Module: Graph -> Network
* Class: JsonBuilder -> Graph
2013-03-07 15:42:30 +09:00
Sato Hiroyuki
83435e3d46
Adding sleep statements to allow sufficient time for the page to settle.
2013-03-06 16:36:11 +09:00
Dmitriy Zaporozhets
3a09f02e11
Merge pull request #3109 from hiroponz/improve-network-graph
...
Improve network graph
2013-03-04 23:02:27 -08:00
Sato Hiroyuki
95b826071f
Add some tests for network graph
2013-03-04 17:50:42 +09:00
Dmitriy Zaporozhets
5c3cb47c16
Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions
...
Conflicts:
db/schema.rb
2013-03-01 16:05:51 +02:00
Sato Hiroyuki
f8009a4858
Fix spinach errors.
2013-03-01 17:28:29 +09:00
Dmitriy Zaporozhets
00ae65b108
try to use stable version for database cleaner
2013-02-28 21:02:41 +02:00
Andrew8xx8
2f1f05d431
Fixed notes from randx
2013-02-28 18:55:35 +04:00
Dmitriy Zaporozhets
e8ff9ad2f2
Merge pull request #2249 from jouve/fix_possible_spec_failure
...
fix one of the possible causes of build failures
2013-02-28 06:45:16 -08:00
Andrew8xx8
cf6d9a2222
Tests for team and group descriptions added
2013-02-28 17:15:22 +04:00
Andrew8xx8
9959669f1c
Desctiptions removed from dashboard
2013-02-28 17:15:22 +04:00
Andrew8xx8
b4648c3b52
Spinach tests fixed
2013-02-28 17:15:22 +04:00
Dmitriy Zaporozhets
e6b5f4ade9
refactor finders in spianch:merge_request.feature
2013-02-28 09:43:48 +02:00
Dmitriy Zaporozhets
51b547f842
Commenting a failing test
2013-02-28 09:25:23 +02:00
Dmitriy Zaporozhets
3cf814ff9d
remove duplicate finder in features/steps/path
2013-02-25 10:28:59 +02:00
Dmitriy Zaporozhets
2d5096b678
Fix ambiguity for member link in test
2013-02-21 12:39:09 +02:00
Dmitriy Zaporozhets
37187336b1
Team features are green now
2013-02-21 12:27:52 +02:00
Dmitriy Zaporozhets
42ce2c1080
improve selectors to pass capybara 2.0
2013-02-21 11:27:22 +02: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
ff94f29be5
States events fixed
2013-02-18 16:49:56 +04:00
Andrew8xx8
6074896cbf
Spinach tests fixed
2013-02-18 14:43:50 +04:00
Jaakko Kantojärvi
c20be05a80
Fix ssh key test by adding valid ssh key
2013-02-17 21:31:48 +02:00
Andrew8xx8
839957cf56
Constants in Events looks good now
2013-02-13 15:48:16 +04:00
Dmitriy Zaporozhets
d64090b8a9
No gitolite in project any more
2013-02-11 19:16:59 +02:00
Dmitriy Zaporozhets
f385c7212e
remove unexisting stubs
2013-02-05 09:14:35 +02:00
Dmitriy Zaporozhets
e6002bdaff
Ability to manage and remove group as owner outside of admin area
2013-02-01 19:04:11 +02:00
Dmitriy Zaporozhets
2af323bbd1
fix active tabs tests
2013-01-31 12:08:56 +02:00
Dmitriy Zaporozhets
8c50707dd4
Merge pull request #2823 from hiroponz/switchable-branch-on-network-graph
...
Switchable the main branch on network graph
2013-01-30 22:21:19 -08:00
Sato Hiroyuki
ad33c39800
Fix wrong path of features.
2013-01-31 13:22:08 +09:00
Dmitriy Zaporozhets
bfd00caff3
Few usability improvments
2013-01-30 17:13:05 +02:00
Dmitriy Zaporozhets
e0b5e26035
Merge pull request #2153 from koenpunt/commit-diff-views
...
Added swipe view for image diff
2013-01-27 11:41:23 -08:00
Koen Punt
e33debc214
Updated commit diff view with some minor visual modifications
...
Prepared diff view for multiple view modes
Converted commits.js to coffeescript
image info in separate coffeescript file
Added swipe view mode
Added onion skin viewMode
2013-01-27 18:27:32 +01:00
Dmitriy Zaporozhets
d24fd32aa5
feature tests
2013-01-27 15:41:35 +02:00
Dmitriy Zaporozhets
cd47e625f0
Fix features
2013-01-27 14:10:42 +02:00
