deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge commit 'master' into discussions

Browse source 
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
This commit is contained in:
Riyad Preukschas 2013-01-15 00:52:25 +01:00
commit 3022786948
930 changed files with 80374 additions and 103682 deletions
Download patch file Download diff file Expand all files Collapse all files

19
features/project/project.feature
View file

@ -1,14 +1,23 @@
Feature: Projects
Background:
Given I signin as a user
Given I sign in as a user
And I own project "Shop"
And project "Shop" has push event
And I visit project "Shop" page
# @wip
# Scenario: I should see project activity
Scenario: I should see project activity
When I visit project "Shop" page
Then I should see project "Shop" activity feed
# @wip
# Scenario: I edit project
Scenario: I visit edit project
When I visit edit project "Shop" page
Then I should see project settings
Scenario: I edit project
When I visit edit project "Shop" page
And change project settings
And I save project
Then I should see project with new settings
# @wip
# Scenario: I visit attachments

14
features/project/service.feature Normal file
View file

@ -0,0 +1,14 @@
Feature: Project Services
Background:
Given I sign in as a user
And I own project "Shop"
Scenario: I should see project services
When I visit project "Shop" services page
Then I should see list of available services
Scenario: Activate gitlab-ci service
When I visit project "Shop" services page
And I click gitlab-ci service link
And I fill gitlab-ci settings
Then I should see service settings saved