[refs #90] fixed merging errors

app/controllers/projects/pull_requests_controller.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-class PullRequestsController < ApplicationController
+class Projects::PullRequestsController < Projects::BaseController
   before_filter :authenticate_user!
   load_resource :project
   #load_and_authorize_resource :pull_request, :through => :project, :find_by => :serial_id #FIXME Disable for development

app/views/projects/pull_requests/index.html.haml

@@ -1,6 +1,6 @@
 -set_meta_tags :title => [title_object(@project), t('.title')]
-= render :partial => 'projects/submenu'
--#render :partial => 'pull_requests/index_sidebar'
+= render :partial => 'submenu'
+-#render :partial => 'index_sidebar'
 %ul.nav.nav-tabs
   %li
     %a{"data-toggle" => "tab", :href => "#show"} Home

app/views/projects/pull_requests/new.html.haml

@@ -1,5 +1,5 @@
 -set_meta_tags :title => [title_object(@project), t('.title')]
-= render :partial => 'projects/submenu'
+= render :partial => 'submenu'
 %h3.bpadding10= raw t '.new', {:base => @base, :head => @head}
 
 =form_for @pull, :url => project_pull_requests_path, :html => {:class => 'well well-large'} do |f|

config/locales/models/pull_request.en.yml

@@ -1,10 +1,11 @@
 en:
-  pull_requests:
-    new:
-      new: 'Create a pull request into <span class="label label-info font14">%{base}</span> from <span class="label label-info font14">%{head}</span>'
-      base_ref: 'Base'
-      head_ref: 'Head'
-      refs: 'branch · tag · commit'
-      base_project: 'Base project'
-      head_project: 'Head project'
-      submit: 'Send pull request'
+  projects:
+    pull_requests:
+      new:
+        new: 'Create a pull request into <span class="label label-info font14">%{base}</span> from <span class="label label-info font14">%{head}</span>'
+        base_ref: 'Base'
+        head_ref: 'Head'
+        refs: 'branch · tag · commit'
+        base_project: 'Base project'
+        head_project: 'Head project'
+        submit: 'Send pull request'

config/locales/models/pull_request.ru.yml

@@ -1,10 +1,11 @@
 ru:
-  pull_requests:
-    new:
-      new: 'Создать запрос на слияние в <span class="label label-info font14">%{base}</span> из <span class="label label-info font14">%{head}</span>'
-      base_ref: 'База'
-      head_ref: 'Источник'
-      refs: 'branch · tag · commit'
-      base_project: 'Базовый проект'
-      head_project: 'Проект-источник'
-      submit: 'Создать запрос на слияние'
+  projects:
+    pull_requests:
+      new:
+        new: 'Создать запрос на слияние в <span class="label label-info font14">%{base}</span> из <span class="label label-info font14">%{head}</span>'
+        base_ref: 'База'
+        head_ref: 'Источник'
+        refs: 'branch · tag · commit'
+        base_project: 'Базовый проект'
+        head_project: 'Проект-источник'
+        submit: 'Создать запрос на слияние'