Did you get latest commits form git or it failed for some reason ?
Read the result.
Also, you can run "git log" and see date of last commit, compare it with gitlab commits.
Did you get latest commits form git or it failed for some reason ?
Read the result.
Also, you can run "git log" and see date of last commit, compare it with gitlab commits.
Become PHP Expert in 30 days
FreeMarriage.com - Free Online Matrimonial
FlashWebHost.com - Professional Web Hosting, Designing.
Run command:
Verified gitlab commits. Its same as result.Code:git log
Code:sherly@HOME:~/www/imagehostnow.com$ git log commit 1316183eb7254f98f2bdf481cd6a2bc12e0ca62e Author: Yujin Boby <[email protected]> Date: Fri Jan 16 11:01:03 2015 +0530 added database info for local dev. added hostname ubuntu to local dev machine list. commit 0bd7477f2418c7b6900c3db56b74247dc1758698 Author: Yujin Boby <[email protected]> Date: Fri Jan 16 10:56:16 2015 +0530 added dev pc to local env commit 13eac1f245d4773502791e31cf8fd1ab654503fa Merge: 91eb8a7 3aa6834 Author: Yujin Boby <[email protected]> Date: Thu Jan 15 04:37:52 2015 +0000 Merge branch 'issue37' into 'master' Show spam reports count in site statistics Fixed #37 :...skipping... commit 1316183eb7254f98f2bdf481cd6a2bc12e0ca62e Author: Yujin Boby <[email protected]> Date: Fri Jan 16 11:01:03 2015 +0530 added database info for local dev. added hostname ubuntu to local dev machine list. commit 0bd7477f2418c7b6900c3db56b74247dc1758698 Author: Yujin Boby <[email protected]> Date: Fri Jan 16 10:56:16 2015 +0530 added dev pc to local env commit 13eac1f245d4773502791e31cf8fd1ab654503fa Merge: 91eb8a7 3aa6834 Author: Yujin Boby <[email protected]> Date: Thu Jan 15 04:37:52 2015 +0000 Merge branch 'issue37' into 'master' Show spam reports count in site statistics Fixed #37 See merge request !31 commit 3aa683407ce683c2b5856bd3f00ffc23a2b0292a Author: Melbin <[email protected]> Date: Thu Jan 15 09:34:31 2015 +0530 Show spam reports count in site statistics commit 91eb8a7980c1fc414ddca6b833841398527138db Merge: c4443de 0c289f7 Author: Yujin Boby <[email protected]> Date: Wed Jan 14 21:08:05 2015 +0000 Merge branch 'issue34' into 'master' Block inactive images from view fixed #34 See merge request !29 commit c4443defa78d92d668d95799e42e76941b523093 Merge: da11fa2 3c46335 Author: Yujin Boby <[email protected]> Date: Wed Jan 14 21:07:55 2015 +0000 Merge branch 'issue33' into 'master' Field to store admin email address in settings fixed #33 :
I asked if you have latest source code. Use "git log" to find it. I don't asked you to post result of git log.
Become PHP Expert in 30 days
FreeMarriage.com - Free Online Matrimonial
FlashWebHost.com - Professional Web Hosting, Designing.
This git pull did not worked as local files changed.
git pull only work if your local files are not changed, if you change, make sure you commit.
For now, since the change is not critical, take git gui, then see the changes, take note of it. Git gui have option to revert changes (check the menu items, you will see it). Revert changes, make sure you can apply those changes back if needed, so if needed make a copy of the file before you revert.
Now
Will say everything updated, no files are listed as changed in git gui too.Code:git status
Now run, "git pull origin master" it will work.
Post result.
Become PHP Expert in 30 days
FreeMarriage.com - Free Online Matrimonial
FlashWebHost.com - Professional Web Hosting, Designing.
I changed Revert changes in git gui.Then run these commands g0t following result:
ResultCode:git status git pull origin master
Code:sherly@HOME:~/www/imagehostnow.com$ git status On branch master Your branch is behind 'origin/master' by 34 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: app/storage/.gitignore modified: app/storage/cache/.gitignore modified: app/storage/logs/.gitignore modified: app/storage/meta/.gitignore modified: app/storage/sessions/.gitignore modified: app/storage/views/.gitignore no changes added to commit (use "git add" and/or "git commit -a") sherly@HOME:~/www/imagehostnow.com$ git pull origin master From ssh://git.buyscripts.in:10022/buyscripts/imagehost * branch master -> FETCH_HEAD Updating 1316183..8ffcaab Fast-forward .gitignore | 4 +- README/install.txt | 1 + app/config/database.php | 6 +-- app/controllers/GalleryController.php | 15 ++++++ app/controllers/ImageController.php | 18 ++----- app/controllers/UploadController.php | 23 ++++---- .../2015_01_06_090738_create_table_images.php | 2 +- .../2015_01_16_062107_add_uid_in_images.php | 30 +++++++++++ ...7_032543_alter_table_images_folder_nullable.php | 28 ++++++++++ ...7_085023_alter_table_images_remove_seo_name.php | 30 +++++++++++ ..._01_17_094457_alter_table_images_remove_uid.php | 30 +++++++++++ app/models/Image.php | 27 +++++++++- app/models/Thumb.php | 58 +++++++++++++++++++++ app/routes.php | 5 +- app/views/admin/image/view.blade.php | 4 +- .../gallery.blade.php => gallery/index.blade.php} | 2 +- app/views/home/index.blade.php | 2 +- app/views/image/index.blade.php | 13 +---- app/views/layouts/master.blade.php | 2 +- app/views/upload/success.blade.php | 29 ----------- app/views/user/images.blade.php | 4 +- public/css/style.css | 3 ++ public/images/logo.png | Bin 0 -> 2337 bytes 23 files changed, 252 insertions(+), 84 deletions(-) create mode 100644 README/install.txt create mode 100644 app/controllers/GalleryController.php create mode 100644 app/database/migrations/2015_01_16_062107_add_uid_in_images.php create mode 100644 app/database/migrations/2015_01_17_032543_alter_table_images_folder_nullable.php create mode 100644 app/database/migrations/2015_01_17_085023_alter_table_images_remove_seo_name.php create mode 100644 app/database/migrations/2015_01_17_094457_alter_table_images_remove_uid.php create mode 100644 app/models/Thumb.php rename app/views/{image/gallery.blade.php => gallery/index.blade.php} (91%) delete mode 100644 app/views/upload/success.blade.php create mode 100644 public/images/logo.png sherly@HOME:~/www/imagehostnow.com$
Good.
Now you see many files are pulled down to your computer.
Some of the files are in folder
That means, there is change in database structure. Some new tables created/deleted or even changed. Every time, database migration files changed, you need to run "php artisan migrate"Code:app/database/migrations
Run it and post result.Code:php artisan migrate
Become PHP Expert in 30 days
FreeMarriage.com - Free Online Matrimonial
FlashWebHost.com - Professional Web Hosting, Designing.
Run the command.
Find below the result.Code:php artisan migrate
Code:sherly@HOME:~/www/imagehostnow.com$ php artisan migrate ************************************** * Application In Production! * ************************************** Do you really wish to run this command? yes [PDOException] SQLSTATE[28000] [1045] Access denied for user 'imagehostnow'@'localhost' (u sing password: YES) migrate [--bench[="..."]] [--database[="..."]] [--force] [--path[="..."]] [--package[="..."]] [--pretend] [--seed] sherly@HOME:~/www/imagehostnow.com$
That is some error.
Can you read the error message and try to find out what it is saying ? What may be the reason for that error ?
Become PHP Expert in 30 days
FreeMarriage.com - Free Online Matrimonial
FlashWebHost.com - Professional Web Hosting, Designing.
Error: SQLSTATE[28000] [1045] Access denied for user 'imagehostnow'@'localhost' (using password: YES)
Reason:I changed Revert changes on app/config/database.php file.
Good.
Now, repeat the steps we done. This need to be done everyday whenever new commit is made to master branch in gitlab, so your source code is always uptodate.
Then verify last commit is same as in gitlab.
Become PHP Expert in 30 days
FreeMarriage.com - Free Online Matrimonial
FlashWebHost.com - Professional Web Hosting, Designing.
Bookmarks