Merge branch 'master' of github.com:gitlabhq/gitlabhq
This commit is contained in:
commit
5a7e3500e9
|
@ -158,7 +158,7 @@ GEM
|
|||
dotenv (>= 0.7)
|
||||
thor (>= 0.13.6)
|
||||
formatador (0.2.4)
|
||||
gemnasium-gitlab-service (0.2.2)
|
||||
gemnasium-gitlab-service (0.2.3)
|
||||
rugged (~> 0.19)
|
||||
gherkin-ruby (0.3.1)
|
||||
racc
|
||||
|
|
|
@ -197,6 +197,7 @@ Gitlab::Application.routes.draw do
|
|||
resources :raw, only: [:show], constraints: {id: /.+/}
|
||||
resources :tree, only: [:show], constraints: {id: /.+/, format: /(html|js)/ }
|
||||
resources :edit_tree, only: [:show, :update], constraints: { id: /.+/ }, path: 'edit' do
|
||||
# Cannot be GET to differentiate from GET paths that end in preview.
|
||||
post :preview, on: :member
|
||||
end
|
||||
resources :new_tree, only: [:show, :update], constraints: {id: /.+/}, path: 'new'
|
||||
|
|
|
@ -16,14 +16,13 @@ Gitlab::Seeder.quiet do
|
|||
|
||||
(1..5).each do |i|
|
||||
begin
|
||||
User.seed(:id, [
|
||||
id: i + 10,
|
||||
username: "user#{i}",
|
||||
name: "User #{i}",
|
||||
email: "user#{i}@example.com",
|
||||
confirmed_at: DateTime.now,
|
||||
password: '12345678'
|
||||
])
|
||||
User.seed do |s|
|
||||
s.username = "user#{i}"
|
||||
s.name = "User #{i}"
|
||||
s.email = "user#{i}@example.com"
|
||||
s.confirmed_at = DateTime.now
|
||||
s.password = '12345678'
|
||||
end
|
||||
print '.'
|
||||
rescue ActiveRecord::RecordNotSaved
|
||||
print 'F'
|
||||
|
|
|
@ -2,16 +2,16 @@ FROM ubuntu:14.04
|
|||
|
||||
# Install required packages
|
||||
RUN apt-get update -q \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -qy \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -qy --no-install-recommends \
|
||||
ca-certificates \
|
||||
openssh-server \
|
||||
wget \
|
||||
&& apt-get clean
|
||||
wget
|
||||
|
||||
# Download & Install GitLab
|
||||
# If the Omnibus package version below is outdated please contribute a merge request to update it.
|
||||
# If you run GitLab Enterprise Edition point it to a location where you have downloaded it.
|
||||
RUN TMP_FILE=$(mktemp); \
|
||||
wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.5.2-omnibus.5.2.1.ci-1_amd64.deb \
|
||||
wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.5.3-omnibus.5.2.1.ci-1_amd64.deb \
|
||||
&& dpkg -i $TMP_FILE \
|
||||
&& rm -f $TMP_FILE
|
||||
|
||||
|
|
|
@ -430,6 +430,26 @@ describe Projects::TreeController, "routing" do
|
|||
end
|
||||
end
|
||||
|
||||
describe Projects::EditTreeController, 'routing' do
|
||||
it 'to #show' do
|
||||
get('/gitlab/gitlabhq/edit/master/app/models/project.rb').should(
|
||||
route_to('projects/edit_tree#show',
|
||||
project_id: 'gitlab/gitlabhq',
|
||||
id: 'master/app/models/project.rb'))
|
||||
get('/gitlab/gitlabhq/edit/master/app/models/project.rb/preview').should(
|
||||
route_to('projects/edit_tree#show',
|
||||
project_id: 'gitlab/gitlabhq',
|
||||
id: 'master/app/models/project.rb/preview'))
|
||||
end
|
||||
|
||||
it 'to #preview' do
|
||||
post('/gitlab/gitlabhq/edit/master/app/models/project.rb/preview').should(
|
||||
route_to('projects/edit_tree#preview',
|
||||
project_id: 'gitlab/gitlabhq',
|
||||
id: 'master/app/models/project.rb'))
|
||||
end
|
||||
end
|
||||
|
||||
# project_compare_index GET /:project_id/compare(.:format) compare#index {id: /[^\/]+/, project_id: /[^\/]+/}
|
||||
# POST /:project_id/compare(.:format) compare#create {id: /[^\/]+/, project_id: /[^\/]+/}
|
||||
# project_compare /:project_id/compare/:from...:to(.:format) compare#show {from: /.+/, to: /.+/, id: /[^\/]+/, project_id: /[^\/]+/}
|
||||
|
|
Loading…
Reference in New Issue