This repository has been archived by the owner on Jul 10, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Feature/add event models #34
Open
Jostavo
wants to merge
42
commits into
master
Choose a base branch
from
feature/add-event-models
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
42 commits
Select commit
Hold shift + click to select a range
6947cd1
feat: update gitignore
eiguike 40de523
feat: add docker files
eiguike 096a9bd
refact: change database.yml to make docker work for this rails app
eiguike 107a3db
doc: docker feature, how to build and to use
eiguike 5e48bf0
Merge branch 'master' into docker_feature
eiguike 7aead9f
Added event model. Still rewriting everything
Jostavo 1b8de60
Almost done, still need to add bootstrap components and test the plat…
Jostavo 8097247
Added DangerCI to the project
Jostavo 1fba18c
Changed CircleCI config file
Jostavo b469e8d
Added pronto config file
Jostavo 162dcec
Added necessary gems
Jostavo dc88af9
Fixing Dangerfile...hopefully
Jostavo b7afd26
Changed path to test results on CircleCI
Jostavo affa005
Alterações relativas às configurações do repo e adicionado modelo de …
Jostavo 729aef6
Added dropdown menu
Jostavo 6e0d53e
changed root routes
Jostavo 82638c5
refact: change docker-compose.yml, passing correct parameters to use …
eiguike d87cd6b
refact: set the default value for login and password
eiguike bd87866
fix: merge conflicts in README.md
eiguike 7c2f58e
refact: changes in circleci's file
eiguike 1797fc4
refact: changes in database.yml
eiguike 7728c70
Merge remote-tracking branch 'remotes/origin/feature/add-event-models…
eiguike 1e7f928
refact: add cmake to install within docker
eiguike ec3debb
refact: get variable environtment for host in database.yml
eiguike 036a89f
refact: rollback changes in circle-ci configuraiton, add new environm…
eiguike 0a8ce06
refact: add new exceptions for gitignore
eiguike 7a1090d
refact: delete useless files
eiguike 707c83a
Merge pull request #28 from caccs/docker_feature
Jostavo a4bf298
Now able to show a single event
Jostavo 96fa2e1
Fix to DangerCI warnings. Some of them will be ignored
Jostavo eb3d65d
fixed problem with dependencies here on the PR too
Jostavo c87967a
Merge branch 'master' into feature/add-event-models
Jostavo 4c56629
trying to fix problem with dependencies (remove required)
Jostavo 3f034f5
Merge branch 'feature/add-event-models' of https://github.com/caccs/c…
Jostavo ef1a5d9
trying to find the problem with the dangerfile
Jostavo 5f427c7
wth is happening
Jostavo 1bca790
committing new Dangerfile (changed to UTF-8)
Jostavo aebbb72
w/e
Jostavo 4c2a975
maybe changing vm config file will work better
Jostavo 7bcc3d5
removed some verifications. I guess the problem is we are verifying f…
Jostavo a1c03e9
-_-
Jostavo dc2693e
just small fixes as pointed by our bot
Jostavo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
Faça um resumo breve das alterações as quais você realizou! | ||
|
||
## SCREENSHOTS | ||
|
||
Tire um tempo para adicionar algumas Screenshots das mudanças! | ||
|
||
## TESTES | ||
|
||
### CENÁRIOS | ||
|
||
Descreva os testes no cenário corretamente | ||
|
||
1. Passo 1 | ||
2. Passo 2 | ||
3. Passo N | ||
|
||
Descreva os resultados esperados |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,28 @@ | ||
/log | ||
/tmp | ||
# See https://help.github.com/articles/ignoring-files for more about ignoring files. | ||
# | ||
# If you find yourself ignoring temporary files generated by your text editor | ||
# or operating system, you probably want to add a global ignore instead: | ||
# git config --global core.excludesfile '~/.gitignore_global' | ||
|
||
# Ignore bundler config. | ||
/.bundle | ||
|
||
# Ignore all logfiles and tempfiles. | ||
/log/* | ||
/tmp/* | ||
!/log/.keep | ||
!/tmp/.keep | ||
|
||
# Ignore uploaded files in development | ||
/storage/* | ||
|
||
/node_modules | ||
/yarn-error.log | ||
|
||
/public/assets/* | ||
/coverage/ | ||
/spec/tmp | ||
.byebug_history | ||
|
||
# Ignore master key for decrypting credentials and more. | ||
/config/master.key |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
all: | ||
exclude: | ||
- 'spec/**/*' | ||
- 'db/migrate/*' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
message = <<-MESSAGE | ||
## Checklist: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Layout/IndentHeredoc: Use 2 spaces for indentation in a heredoc by using some library(e.g. ActiveSupport's |
||
- [ ] Run tests locally | ||
- [ ] If you modified some Front files, add ScreenShots! | ||
- [ ] Run tests manually | ||
- [ ] Remove (after you program them) all of your TODOS | ||
- [ ] [Rails Security Checklist](https://github.com/brunofacca/zen-rails-security-checklist) | ||
- [ ] [Rails Style Guide](https://github.com/bbatsov/rails-style-guide) | ||
- [ ] [Ruby Style Guide](https://github.com/bbatsov/ruby-style-guide) | ||
MESSAGE | ||
|
||
markdown(message) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
FROM postgres | ||
FROM ruby:2.3.6 | ||
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs cmake | ||
RUN mkdir /caccs.io | ||
WORKDIR /caccs.io | ||
COPY Gemfile /caccs.io/Gemfile | ||
COPY Gemfile.lock /caccs.io/Gemfile.lock | ||
RUN bundle install | ||
COPY . /caccs.io |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,46 +1,72 @@ | ||
source 'https://rubygems.org' | ||
|
||
git_source(:github) do |repo_name| | ||
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") | ||
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/') | ||
"https://github.com/#{repo_name}.git" | ||
end | ||
|
||
gem 'bcrypt', '~> 3.1.11' | ||
gem 'bootstrap-sass', '3.3.7' | ||
gem 'rails', '~> 5.1.4' | ||
gem 'puma', '~> 3.7' | ||
gem 'sass-rails', '~> 5.0' | ||
gem 'uglifier', '>= 1.3.0' | ||
gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47' | ||
gem 'coffee-rails', '~> 4.2' | ||
gem 'turbolinks', '~> 5' | ||
gem 'danger' | ||
gem 'danger-github_ext' | ||
gem 'danger-simplecov_json' | ||
gem 'danger-todoist' | ||
gem 'font-awesome-rails' | ||
gem 'fullcalendar-rails' | ||
gem 'jbuilder', '~> 2.5' | ||
gem 'jquery-rails' | ||
gem 'kaminari' | ||
gem 'mailjet' | ||
gem 'parsley-rails' | ||
gem 'font-awesome-rails' | ||
gem 'momentjs-rails' | ||
gem 'fullcalendar-rails' | ||
gem 'bcrypt', '~> 3.1.11' | ||
gem 'kaminari' | ||
gem 'parsley-rails' | ||
gem 'puma', '~> 3.7' | ||
gem 'rails', '~> 5.1.4' | ||
gem 'sass-rails', '~> 5.0' | ||
gem 'turbolinks', '~> 5' | ||
gem 'uglifier', '>= 1.3.0' | ||
gem 'validates_timeliness', '~> 4.0' | ||
|
||
group :development, :test do | ||
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] | ||
gem 'brakeman' | ||
gem 'byebug', '~> 9.1.0' | ||
gem 'capybara', '~> 2.13' | ||
gem 'selenium-webdriver' | ||
gem 'rspec-rails', '~> 3.7' | ||
gem 'factory_girl_rails', '~> 4.8.0' | ||
gem 'pronto' | ||
gem 'pronto-brakeman' | ||
gem 'pronto-fasterer' | ||
gem 'pronto-flay' | ||
gem 'pronto-rails_best_practices' | ||
gem 'pronto-rails_schema' | ||
gem 'pronto-reek' | ||
gem 'pronto-rubocop' | ||
gem 'pronto-simplecov' | ||
gem 'pry', '~> 0.11.1' | ||
gem 'pry-byebug', '~> 3.5.0' | ||
gem 'rails-controller-testing' | ||
gem 'rails_best_practices' | ||
gem 'reek' | ||
gem 'rspec', '~> 3.7' | ||
gem 'rspec-rails', '~> 3.7' | ||
gem 'rspec_junit_formatter' | ||
gem 'rails-controller-testing' | ||
gem 'rubocop' | ||
gem 'selenium-webdriver' | ||
end | ||
|
||
group :development do | ||
gem 'web-console', '>= 3.3.0' | ||
gem 'guard' | ||
gem 'guard-rails' | ||
gem 'guard-rspec' | ||
gem 'guard-rubocop' | ||
gem 'listen', '>= 3.0.5', '< 3.2' | ||
gem 'spring' | ||
gem 'spring-watcher-listen', '~> 2.0.0' | ||
gem 'web-console', '>= 3.3.0' | ||
end | ||
|
||
group :production do | ||
gem 'pg', '~> 0.20' | ||
end | ||
|
||
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] | ||
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pronto? ausheuahesae
At least you could use a english word here. hauehuhaes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you fucking kidding me?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shame
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sudoku