Skip to content

Commit

Permalink
Merge branch 'release/1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
zaimramlan committed Nov 21, 2019
2 parents 716db3c + 8fecd6b commit 8d7cae4
Show file tree
Hide file tree
Showing 11 changed files with 247 additions and 172 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Deploy to Production

on:
push:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1

- name: Deploy app
env:
TOKEN: ${{ secrets.HEROKU_API_TOKEN }}
APP: ${{ secrets.HEROKU_APP_PRODUCTION }}
run: git push -f https://heroku:$TOKEN@git.heroku.com/$APP.git HEAD:master
19 changes: 19 additions & 0 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Deploy to Staging

on:
push:
branches:
- develop

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1

- name: Deploy app
env:
TOKEN: ${{ secrets.HEROKU_API_TOKEN }}
APP: ${{ secrets.HEROKU_APP_STAGING }}
run: git push -f https://heroku:$TOKEN@git.heroku.com/$APP.git HEAD:master
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Changelogs

**v1.3.0 - 21/11/2019**
- Preload Zones in State query
- Updated to the latest Rails 5
- Updated dependencies
- Added monitoriing
- Integrated Github Actions

**v1.2.3 - 07/04/2019**
- Resolve minor issue

**v1.2.2 - 06/04/2019**
- Resolve minor issue

**v1.2.1 - 04/01/2019**
- Resolve minor issue

**v1.2.0 - 04/01/2019**
- Added v2 scraper to scrape from e-solat's new format

**v1.1.0 - 02/09/2018**
- Added backup scraper to scrape from a backup source

**v1.0.1 - 15/01/2018**
- Modify sanitiser to offset incorrect prayer times

**v1.0.0 - 01/02/2017**
- Initial API Release
35 changes: 17 additions & 18 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,25 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

gem 'rails', '~> 5.0.1'
gem 'pg', '~> 0.19.0'
gem 'puma', '~> 3.0'
gem 'sass-rails', '~> 5.0'
gem 'coffee-rails', '~> 4.2.1'
gem 'jquery-rails', '~> 4.2.2'
gem 'uglifier', '>= 1.3.0'
gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.5'
gem 'httparty', '~> 0.16.2'
gem 'figaro', git: 'https://github.com/zaimramlan/figaro.git'
gem 'rails', '~> 5.2.0'
gem 'pg', '~> 0.19.0'
gem 'puma', '~> 3.12.1'
gem 'sass-rails', '~> 5.0'
gem 'coffee-rails', '~> 4.2.1'
gem 'jquery-rails', '~> 4.2.2'
gem 'uglifier', '>= 1.3.0'
gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.5'
gem 'httparty', '~> 0.16.2'
gem 'figaro', git: 'https://github.com/zaimramlan/figaro.git'
gem 'nokogiri'
gem 'newrelic_rpm'

group :development do
gem 'web-console', '>= 3.3.0'
gem 'spring', '~> 2.0'
gem 'web-console', '>= 3.3.0'
gem 'spring', '~> 2.0'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'byebug', '~> 9.0', '>= 9.0.6', platform: :mri
gem 'listen', '~> 3.0.5'
gem 'awesome_print', '~> 1.7'
gem 'byebug', '~> 9.0', '>= 9.0.6', platform: :mri
gem 'listen', '~> 3.0.5'
gem 'awesome_print', '~> 1.7'
end

gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
Loading

0 comments on commit 8d7cae4

Please sign in to comment.