Skip to content

Commit

Permalink
Merged Gemfile
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Hoernecke committed Nov 2, 2016
2 parents 7940ce9 + eeff6ad commit 559cf6e
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 28 deletions.
23 changes: 9 additions & 14 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ GEM
colorize (0.8.1)
columnize (0.8.9)
commonjs (0.2.7)
connection_pool (2.0.0)
concurrent-ruby (1.0.2)
connection_pool (2.2.0)
crack (0.1.8)
database_cleaner (1.3.0)
debug_inspector (0.0.2)
Expand Down Expand Up @@ -208,7 +209,6 @@ GEM
hashie (3.4.6)
highline (1.7.8)
hike (1.2.3)
hitimes (1.2.4)
http (0.6.2)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.2)
Expand Down Expand Up @@ -368,8 +368,6 @@ GEM
trollop (>= 1.16.2)
redcarpet (3.3.4)
redis (3.3.1)
redis-namespace (1.5.1)
redis (~> 3.0, >= 3.0.4)
ref (2.0.0)
responders (2.2.0)
railties (>= 4.2.0, < 5.1)
Expand Down Expand Up @@ -417,14 +415,13 @@ GEM
shoulda-context (1.2.1)
shoulda-matchers (2.6.2)
activesupport (>= 3.0.0)
sidekiq (3.0.2)
celluloid (>= 0.15.2)
connection_pool (>= 2.0.0)
json
redis (>= 3.0.6)
redis-namespace (>= 1.3.1)
sidekiq-status (0.5.0)
sidekiq (>= 2.7, < 3.1)
sidekiq (4.2.3)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
redis (~> 3.2, >= 3.2.1)
sidekiq-status (0.6.0)
sidekiq (>= 2.7)
signet (0.7.2)
addressable (~> 2.3)
faraday (~> 0.9)
Expand Down Expand Up @@ -462,8 +459,6 @@ GEM
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
timers (4.1.1)
hitimes
trollop (2.1.2)
turbolinks (2.2.2)
coffee-rails
Expand Down
19 changes: 18 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Scumblr uses the [Workflowable gem](https://github.com/Netflix/Workflowable) to

## How do I use Scumblr?

Scumblr is a web application based on Ruby on Rails. In order to get started, you'll need to setup / deploy a Scumblr environment and configure it to search and analyze the things you care about. Setup information is described in great detail on the [Wiki](https://github.com/Netflix/Scumblr2/wiki).
Scumblr is a web application based on Ruby on Rails. In order to get started, you'll need to setup / deploy a Scumblr environment and configure it to search and analyze the things you care about. Setup information is described in great detail on the [Wiki](https://github.com/Netflix/Scumblr/wiki).

You'll optionally want to setup and configure workflows so that you can track the status of identified results through your triage process.

Expand Down Expand Up @@ -74,6 +74,23 @@ Take a look at the [wiki](https://github.com/Netflix/Scumblr/wiki) for detailed

## Release History ##

**Version 2.0.1** - "O'Reilly Security Edition" - *November 2nd, 2016*

This is a minor release that addresses a few bugs and adds some new features

* Releasing curl 2 security task added which includes a number of new features:

> Response Metadata: New option to allow you to arbitrarily define metadata to collect from http responses (think CSP policies, Server headers)
> Option: Negative searching
> Option: Strip path off of result (useful for sitemaps that may have trailing images, etc.)
* Abstract view for response metadata with filtering and pagination
* A number of bug fixes in views
* Fixed an issue with curl security task and thread safety
* Updated stylesheets for better views on small screens

**Version 2.0** - "Dirty Laundry" - *October 12th, 2016*

This is a major release that addresses a number of bugs and adds many new features
Expand Down
84 changes: 71 additions & 13 deletions app/assets/stylesheets/application.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,9 @@ background: linear-gradient(to left, #141E30 , #243B55); /* W3C, IE 10+/ Edge, F

.top-bar-section ul.left li.name{
display: inline-block;
color: #fff!important;
color: #fff;
text-decoration: none;
background: transparent; /* fallback for old browsers */

background: transparent; /* fallback for old browsers */
}

.top-bar-section ul.left li.name::after {
Expand All @@ -374,11 +373,35 @@ background: linear-gradient(to left, #141E30 , #243B55); /* W3C, IE 10+/ Edge, F
color: #ffffff!important;
}

.top-bar-section ul.left li.name.active::after {
content: '';
display: block;
width: 100%;
height: 4px;
@media screen and (max-width: 1250px) {

.top-bar-section ul.left li.name{
display: block!important;
}

.top-bar .title-area .name {
border-bottom: 1px solid #fff;
}

nav.top-bar .top-bar-section li:not(.has-form) a:not(.button) {
line-height: 25px!important;
}

.top-bar-section .name {
height: auto;
}

.top-bar-section .divider {
border-top: solid 1px #fff!important;
}

}

.top-bar-section ul.left li.name{
display: inline-block;
color: #fff;
text-decoration: none;
background: transparent; /* fallback for old browsers */
}


Expand Down Expand Up @@ -446,18 +469,31 @@ table tr th, table tr td {
z-index: 105 !important;
}

nav.top-bar {
margin-bottom: 0.9375rem;
background: #141E30; /* fallback for old browsers */
background: -webkit-linear-gradient(to left, #141E30 , #243B55); /* Chrome 10-25, Safari 5.1-6 */
background: linear-gradient(to left, #141E30 , #243B55); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
nav.top-bar, .top-bar.expanded .title-area {
/* margin-bottom: 0.9375rem;*/
background: #141E30!important; /* fallback for old browsers */
background: -webkit-linear-gradient(to left, #141E30 , #243B55)!important; /* Chrome 10-25, Safari 5.1-6 */
background: linear-gradient(to left, #141E30 , #243B55)!important; /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
}

.top-bar-section li:not(.has-form) a:not(.button) {
line-height: 51px!important;
background: transparent!important;
}

@media only screen and (min-width: 1250px) {

.top-bar-section .has-dropdown.hover > .dropdown, .top-bar-section .has-dropdown.not-click:hover > .dropdown {
top: 55px;
}
}

@media only screen and (min-width: 64.063em){
.large-9 {
width: 75%;
padding-right: 0!important;
}
}


nav.warning-bar
Expand All @@ -478,6 +514,16 @@ nav.top-bar ul li.has-dropdown ul.dropdown li
background-color: #243B55 !important;
}

.top-bar-section .dropdown li.title h5 a {
color: #008cba!important;
font-size: 14px;
padding-bottom: 0;
padding-top: 15px;
font-weight: 700;
text-transform: uppercase;
display: block;
}

nav.top-bar ul li.has-dropdown ul.dropdown li label
{
background-color: #243B55 !important;
Expand All @@ -496,6 +542,10 @@ nav label

}

.tab-bar, .large-9.columns a.button {
margin-top: 0.9375rem!important;
}

.tab-bar h1 span.small-heading
{
font-size: 11px;
Expand Down Expand Up @@ -560,6 +610,7 @@ nav label
margin-right: 5px;
}


button.adjust_top
{
position:relative !important;
Expand Down Expand Up @@ -640,6 +691,13 @@ button.adjust_top
top: .9em;
}

table {
background: white;
margin-bottom: 1.25rem;
margin-top: 0.9375rem!important;
border: solid 1px #dddddd;
}

table button,table .button
{
margin-bottom: 0px;
Expand Down

0 comments on commit 559cf6e

Please sign in to comment.