diff --git a/app/assets/javascripts/pull_rquests.js.coffee b/app/assets/javascripts/pull_rquests.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/pull_rquests.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/pull_rquests.css.scss b/app/assets/stylesheets/pull_rquests.css.scss new file mode 100644 index 000000000..89d608475 --- /dev/null +++ b/app/assets/stylesheets/pull_rquests.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the pull_rquests controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/pull_rquests_controller.rb b/app/controllers/pull_rquests_controller.rb new file mode 100644 index 000000000..2fcdf79df --- /dev/null +++ b/app/controllers/pull_rquests_controller.rb @@ -0,0 +1,18 @@ +class PullRquestsController < ApplicationController + before_filter :find_project + layout "base_projects" + + def index + + end + + def new + + end + + def find_project + @project = Project.find(params[:project_id]) + rescue ActiveRecord::RecordNotFound + render_404 + end +end diff --git a/app/helpers/pull_rquests_helper.rb b/app/helpers/pull_rquests_helper.rb new file mode 100644 index 000000000..1b3eef9a4 --- /dev/null +++ b/app/helpers/pull_rquests_helper.rb @@ -0,0 +1,2 @@ +module PullRquestsHelper +end diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 2c7d36fb5..a218e368d 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -57,6 +57,15 @@ <% end %> +<% if User.current.member_of?(@project) %> +