oonyeje/Pearlception_Website_RoR
1
0
Fork 0
mirror of https://github.com/oonyeje/Pearlception_Website_RoR.git synced 2025-12-25 11:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
bmv root 2017-02-24 14:56:31 -05:00
parent 9726f8529e
commit edbcd9a0e6
3 changed files with 2450 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Pearlception/app/controllers/dashboard_controller.rb
View File

@ -2,9 +2,6 @@ class DashboardController < ApplicationController
before_filter :deny_to_visitors before_filter :deny_to_visitors
def index def index
<<<<<<< HEAD
@results = Result.page(params[:page]).per(5)
=======
#This is a temporary fix until runs and results models are properly discussed with bobby #This is a temporary fix until runs and results models are properly discussed with bobby
#@results = Result.page(params[:page]).per(5) #@results = Result.page(params[:page]).per(5)
if current_user.admin? if current_user.admin?
@ -29,7 +26,6 @@ class DashboardController < ApplicationController
@results = Run.page(params[:page]).per(5) @results = Run.page(params[:page]).per(5)
end end
>>>>>>> 66dfc7d12c7a612332c9b8de8f32df39a0d362ce
end end
def deny_to_visitors def deny_to_visitors

10
Pearlception/config/database.yml
View File

@ -31,13 +31,8 @@ stats_test:
development: development:
<<: *default <<: *default
database: Pearlception_development database: Pearlception_development
<<<<<<< HEAD
username: <%= ENV['DEV_DB_USER']%>
password: <%= ENV['DEV_DB_PASS']%>
=======
username: bmv username: bmv
password: 1156244terps! password: 1156244terps!
>>>>>>> 66dfc7d12c7a612332c9b8de8f32df39a0d362ce
# Warning: The database defined as "test" will be erased and # Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake". # re-generated from your development database when you run "rake".
@ -45,13 +40,8 @@ development:
test: test:
<<: *default <<: *default
database: Pearlception_test database: Pearlception_test
<<<<<<< HEAD
username: <%= ENV['DEV_DB_USER']%>
password: <%= ENV['DEV_DB_PASS']%>
=======
username: bmv username: bmv
password: 1156244terps! password: 1156244terps!
>>>>>>> 66dfc7d12c7a612332c9b8de8f32df39a0d362ce
# As with config/secrets.yml, you never want to store sensitive information, # As with config/secrets.yml, you never want to store sensitive information,
# like your database password, in your source code. If your source code is # like your database password, in your source code. If your source code is

2450
Pearlception/nohup.out Normal file
View File

File diff suppressed because it is too large Load Diff