Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ac5842d9
Commit
ac5842d9
authored
Dec 05, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate application to rails 4 step 1
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
8a54fda4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
8 deletions
+7
-8
config/application.rb
config/application.rb
+2
-6
config/initializers/devise.rb
config/initializers/devise.rb
+1
-0
config/initializers/gemoji.rb
config/initializers/gemoji.rb
+1
-0
config/initializers/secret_token.rb
config/initializers/secret_token.rb
+1
-0
config/routes.rb
config/routes.rb
+2
-2
No files found.
config/application.rb
View file @
ac5842d9
require
File
.
expand_path
(
'../boot'
,
__FILE__
)
require
File
.
expand_path
(
'../boot'
,
__FILE__
)
require
'rails/all'
require
'rails/all'
require
'devise'
if
defined?
(
Bundler
)
Bundler
.
require
(
:default
,
Rails
.
env
)
# If you precompile assets before deploying to production, use this line
# Bundler.require(*Rails.groups(assets: %w(development test)))
# If you want your assets lazily compiled in production, use this line
Bundler
.
require
(
:default
,
:assets
,
Rails
.
env
)
end
module
Gitlab
module
Gitlab
class
Application
<
Rails
::
Application
class
Application
<
Rails
::
Application
...
...
config/initializers/devise.rb
View file @
ac5842d9
...
@@ -6,6 +6,7 @@ Devise.setup do |config|
...
@@ -6,6 +6,7 @@ Devise.setup do |config|
# note that it will be overwritten if you use your own mailer class with default "from" parameter.
# note that it will be overwritten if you use your own mailer class with default "from" parameter.
config
.
mailer_sender
=
Gitlab
.
config
.
gitlab
.
email_from
config
.
mailer_sender
=
Gitlab
.
config
.
gitlab
.
email_from
# Configure the class responsible to send e-mails.
# Configure the class responsible to send e-mails.
# config.mailer = "Devise::Mailer"
# config.mailer = "Devise::Mailer"
...
...
config/initializers/gemoji.rb
View file @
ac5842d9
# Workaround for https://github.com/github/gemoji/pull/18
# Workaround for https://github.com/github/gemoji/pull/18
require
'gemoji'
Gitlab
::
Application
.
config
.
assets
.
paths
<<
Emoji
.
images_path
Gitlab
::
Application
.
config
.
assets
.
paths
<<
Emoji
.
images_path
config/initializers/secret_token.rb
View file @
ac5842d9
...
@@ -21,3 +21,4 @@ def find_secure_token
...
@@ -21,3 +21,4 @@ def find_secure_token
end
end
Gitlab
::
Application
.
config
.
secret_token
=
find_secure_token
Gitlab
::
Application
.
config
.
secret_token
=
find_secure_token
Gitlab
::
Application
.
config
.
secret_key_base
=
find_secure_token
config/routes.rb
View file @
ac5842d9
...
@@ -22,7 +22,7 @@ Gitlab::Application.routes.draw do
...
@@ -22,7 +22,7 @@ Gitlab::Application.routes.draw do
project_root:
Gitlab
.
config
.
gitlab_shell
.
repos_path
,
project_root:
Gitlab
.
config
.
gitlab_shell
.
repos_path
,
upload_pack:
Gitlab
.
config
.
gitlab_shell
.
upload_pack
,
upload_pack:
Gitlab
.
config
.
gitlab_shell
.
upload_pack
,
receive_pack:
Gitlab
.
config
.
gitlab_shell
.
receive_pack
receive_pack:
Gitlab
.
config
.
gitlab_shell
.
receive_pack
}),
at:
'/'
,
constraints:
lambda
{
|
request
|
/[-\/\w\.]+\.git\//
.
match
(
request
.
path_info
)
}
}),
at:
'/'
,
constraints:
lambda
{
|
request
|
/[-\/\w\.]+\.git\//
.
match
(
request
.
path_info
)
}
,
via:
[
:get
,
:post
]
#
#
# Help
# Help
...
@@ -131,7 +131,7 @@ Gitlab::Application.routes.draw do
...
@@ -131,7 +131,7 @@ Gitlab::Application.routes.draw do
end
end
end
end
match
"/u/:username"
=>
"users#show"
,
as: :user
,
constraints:
{
username:
/.*/
}
match
"/u/:username"
=>
"users#show"
,
as: :user
,
constraints:
{
username:
/.*/
}
,
via: :get
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment