From 50f488eb8859a4ccdd2fddc9d87e7cb557c3d8eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BB=A9c=20=C4=90=E1=BA=A1t=20Ph=C3=B3?= <Đức Đạt Phó> Date: Tue, 18 Apr 2017 19:43:07 +0700 Subject: [PATCH 1/6] working --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 8d7b3eb..0333d15 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'coffee-rails', '~> 4.2' gem 'jquery-rails' # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks gem 'turbolinks', '~> 5' -# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +## Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production # gem 'redis', '~> 3.0' From f4563d44d0c148c1b2552358bb55a137c1a87c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BB=A9c=20=C4=90=E1=BA=A1t=20Ph=C3=B3?= <Đức Đạt Phó> Date: Tue, 18 Apr 2017 19:52:25 +0700 Subject: [PATCH 2/6] lalaa --- LICENSE | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 5b33d60..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 TrungNT - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. From 368f3031a39228fdc51b9492e03c28e69c55a16f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BB=A9c=20=C4=90=E1=BA=A1t=20Ph=C3=B3?= <Đức Đạt Phó> Date: Tue, 18 Apr 2017 19:59:44 +0700 Subject: [PATCH 3/6] Edit lai --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0333d15..8d7b3eb 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'coffee-rails', '~> 4.2' gem 'jquery-rails' # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks gem 'turbolinks', '~> 5' -## Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production # gem 'redis', '~> 3.0' From bf7fc8e09585b938627919f2d17026fa68822a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BB=A9c=20=C4=90=E1=BA=A1t=20Ph=C3=B3?= <Đức Đạt Phó> Date: Tue, 18 Apr 2017 20:02:21 +0700 Subject: [PATCH 4/6] sdasd --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 8d7b3eb..995bf7b 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ gem 'coffee-rails', '~> 4.2' # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks -gem 'turbolinks', '~> 5' +gem 'turbolinks', '~> 5's # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production From bbee270a5946839f8652f1bf8d104d9638b37a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BB=A9c=20=C4=90=E1=BA=A1t=20Ph=C3=B3?= <Đức Đạt Phó> Date: Tue, 18 Apr 2017 20:11:17 +0700 Subject: [PATCH 5/6] asdad --- Gemfile - Copy | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 Gemfile - Copy diff --git a/Gemfile - Copy b/Gemfile - Copy new file mode 100644 index 0000000..995bf7b --- /dev/null +++ b/Gemfile - Copy @@ -0,0 +1,53 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.1' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.2' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5's +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platform: :mri +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] From 590f3d7baad35e7c30919bd6d0683efce3b9280b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BB=A9c=20=C4=90=E1=BA=A1t=20Ph=C3=B3?= <Đức Đạt Phó> Date: Tue, 18 Apr 2017 20:13:33 +0700 Subject: [PATCH 6/6] Toi da edit cai nay --- Gemfile - Copy | 53 -------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 Gemfile - Copy diff --git a/Gemfile - Copy b/Gemfile - Copy deleted file mode 100644 index 995bf7b..0000000 --- a/Gemfile - Copy +++ /dev/null @@ -1,53 +0,0 @@ -source 'https://rubygems.org' - -git_source(:github) do |repo_name| - repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") - "https://github.com/#{repo_name}.git" -end - - -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.0.1' -# Use sqlite3 as the database for Active Record -gem 'sqlite3' -# Use Puma as the app server -gem 'puma', '~> 3.0' -# Use SCSS for stylesheets -gem 'sass-rails', '~> 5.0' -# Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' -# Use CoffeeScript for .coffee assets and views -gem 'coffee-rails', '~> 4.2' -# See https://github.com/rails/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby - -# Use jquery as the JavaScript library -gem 'jquery-rails' -# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks -gem 'turbolinks', '~> 5's -# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.5' -# Use Redis adapter to run Action Cable in production -# gem 'redis', '~> 3.0' -# Use ActiveModel has_secure_password -# gem 'bcrypt', '~> 3.1.7' - -# Use Capistrano for deployment -# gem 'capistrano-rails', group: :development - -group :development, :test do - # Call 'byebug' anywhere in the code to stop execution and get a debugger console - gem 'byebug', platform: :mri -end - -group :development do - # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. - gem 'web-console', '>= 3.3.0' - gem 'listen', '~> 3.0.5' - # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring - gem 'spring' - gem 'spring-watcher-listen', '~> 2.0.0' -end - -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]