Skip to content

Commit

Permalink
Merge branch 'release/v1.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
tayfunoziserikan committed Aug 25, 2015
2 parents c0454eb + d31374d commit 1a46fc8
Show file tree
Hide file tree
Showing 38 changed files with 629 additions and 264 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
*.gem
*.log
.bundle/
*.bundle/install.log
*.bundle/install.log
Gemfile.lock
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.2.3
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@

#### [Current]
* [81358eb](../../commit/81358eb) - __(Tayfun Öziş ERİKAN)__ Some typos were fixed
* [0918eb6](../../commit/0918eb6) - __(Tayfun Öziş ERİKAN)__ Gemfile.lock was removed
* [648ed0a](../../commit/648ed0a) - __(Tayfun Öziş ERİKAN)__ File name was changed
* [c4cb51c](../../commit/c4cb51c) - __(Tayfun Öziş ERİKAN)__ License and version files were updated
* [f5b99e9](../../commit/f5b99e9) - __(Tayfun Öziş ERİKAN)__ Improvements were done - Ruby 2.2.3 version was added - Rails 4.2.3 version was added - Gemfile.lock was removed - Gemspec was improved
* [cf14f9e](../../commit/cf14f9e) - __(Ismail Akbudak)__ fix user
* [e0a7b20](../../commit/e0a7b20) - __(Ismail Akbudak)__ add ssh port for capistrano
* [171e45f](../../commit/171e45f) - __(Ismail Akbudak)__ add first deploy task for capistrano
* [1433ad6](../../commit/1433ad6) - __(Ismail Akbudak)__ improvement
* [a5158f0](../../commit/a5158f0) - __(Ismail Akbudak)__ fix errors
* [5ade7e4](../../commit/5ade7e4) - __(Ismail Akbudak)__ add new features
* [952a035](../../commit/952a035) - __(Ismail Akbudak)__ add devise return path
* [7c55b0e](../../commit/7c55b0e) - __(Ismail Akbudak)__ add capistrano 3.4 with settings
* [4930faa](../../commit/4930faa) - __(Ismail Akbudak)__ add notification messages view
* [16c8780](../../commit/16c8780) - __(Ismail Akbudak)__ implement localizations to view
* [0102c3b](../../commit/0102c3b) - __(Ismail Akbudak)__ add missing file
* [693c179](../../commit/693c179) - __(Ismail Akbudak)__ add localization files
* [388cee0](../../commit/388cee0) - __(Ismail Akbudak)__ add new methods and remove old methods
* [e7fd568](../../commit/e7fd568) - __(Ismail Akbudak)__ update gems version
* [44cfd06](../../commit/44cfd06) - __(Murat Kemal BAYGÜN)__ TB-65 Fix link
* [4bde163](../../commit/4bde163) - __(Murat Kemal BAYGÜN)__ TB-65 Fix contributor link
* [e0a97bd](../../commit/e0a97bd) - __(Ahmet Sezgin Duran)__ Merge tag '1.6.2' into develop

#### 1.6.2
* [822cbf3](../../commit/822cbf3) - __(Onur Özgür ÖZKAN)__ Update GEM version.
* [eb6a510](../../commit/eb6a510) - __(Ahmet Sezgin Duran)__ Merge tag '1.6.1' into develop
* [584eb94](../../commit/584eb94) - __(Ahmet Sezgin Duran)__ TB-60 #time 1m Bump version 1.6.2 and dump changelog
* [653ad04](../../commit/653ad04) - __(Ahmet Sezgin Duran)__ TB-60 #time 30m Fix profile controller errors

#### 1.6.1
Expand Down
92 changes: 0 additions & 92 deletions Gemfile.lock

This file was deleted.

4 changes: 2 additions & 2 deletions MIT-LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2014 lab2023 - information technologies
Copyright © 2013-2015 lab2023 - information technologies

MIT License

Expand All @@ -19,4 +19,4 @@ 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.
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ western colonies from around the 6th century BCE.

Before generating your application, you will need:

* Ruby ~> 2.0
* Rails ~> 4.0
* Ruby ~> 2.2
* Rails ~> 4.2

## Usage

Expand All @@ -33,13 +33,13 @@ rake db:migrate

## What cybele do and included?

Let's look the [Gemfile](https://raw.github.com/kebab-project/cybele/develop/templates/cybele_Gemfile) which created by cybele.
Let's look the [Gemfile](https://raw.github.com/lab2023/cybele/develop/templates/cybele_Gemfile) which created by cybele.

## Bugs and Feedback

If you discover any bugs or want to drop a line, feel free to create an issue on GitHub.

http://github.com/kebab-project/cybele/issues
http://github.com/lab2023/cybele/issues

## Contributing

Expand All @@ -58,10 +58,10 @@ Once you've made your great commits:
![lab2023](http://lab2023.com/assets/images/named-logo.png)

- Cybele is maintained and funded by [lab2023 - information technologies](http://lab2023.com/)
- Thank you to all the [contributors!](https://github.com/kebab-project/cybele/graphs/contributors)
- Thank you to all the [contributors!](../../graphs/contributors)
- This gem is inspired from [suspender](https://github.com/thoughtbot/suspenders)
- The names and logos for lab2023 are trademarks of lab2023, inc.

## License

Copyright 2014 lab2023 - information technologies
Copyright © 2013-2015 [lab2023 - information technologies](http://lab2023.com)
32 changes: 17 additions & 15 deletions cybele.gemspec
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
# coding: utf-8
# encoding: utf-8
lib = File.expand_path('../lib', __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require File.expand_path('../lib/cybele/version', __FILE__)
require 'date'

Gem::Specification.new do |spec|
spec.name = 'cybele'
spec.version = Cybele::VERSION
spec.authors = %w[lab2023]
spec.email = %w[info@lab2023.com]
spec.description = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
spec.summary = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
spec.homepage = 'https://github.com/kebab-project/cybele'
spec.license = 'MIT'
spec.name = 'cybele'
spec.version = Cybele::VERSION
spec.authors = %w[lab2023]
spec.email = %w[info@lab2023.com]
spec.description = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
spec.summary = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
spec.homepage = 'https://github.com/kebab-project/cybele'
spec.license = 'MIT'
spec.date = Date.today.strftime('%Y-%m-%d')

spec.required_ruby_version = '>= 2.0.0'
spec.required_ruby_version = ">= #{Cybele::RUBY_VERSION}"
spec.add_dependency 'bundler', '~> 1.5'
spec.add_dependency 'rails', '~> 4.0'
spec.add_dependency 'rails', Cybele::RAILS_VERSION

spec.files = `git ls-files`.split($/)
spec.executables = %w[cybele]
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = %w[lib]
spec.files = `git ls-files`.split($/)
spec.executables = %w[cybele]
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths= %w[lib]

spec.add_development_dependency 'rake'

Expand Down
Loading

0 comments on commit 1a46fc8

Please sign in to comment.