summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upgrade-annotate' into 'master' Robert Speicher2016-04-111-3/+3
|\
| * Upgrade annotate from 2.6.10 to 2.7.0connorshea2016-04-101-3/+3
* | Upgrade premailer-rails from 1.9.0 to 1.9.2connorshea2016-04-101-3/+3
|/
* Upgrade Sprockets from 3.3.5 to 3.6.0.connorshea2016-04-091-2/+3
* Merge branch 'rs-update-rails' into 'master' Robert Speicher2016-04-091-36/+36
|\
| * Bump rails to 4.2.6rs-update-railsRobert Speicher2016-04-051-36/+36
* | Merge branch 'redis-connection-pool' into 'master' Robert Speicher2016-04-081-0/+1
|\ \
| * | Make redis an explicit Gemfile dependencyJacob Vosmaer2016-04-061-0/+1
| |/
* | Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2connorshea2016-04-061-15/+5
* | Merge branch 'upgrade-bundler-audit' into 'master' Robert Speicher2016-04-051-1/+1
|\ \ | |/ |/|
| * Upgrade bundler-audit from 0.4.0 to 0.5.0connorshea2016-03-281-1/+1
* | Cache Banzai projects/objects using RequestStoreYorick Peterse2016-04-041-2/+2
* | Merge branch 'upgrade-coffee-rails' into 'master' Robert Speicher2016-03-311-2/+2
|\ \ | |/ |/|
| * Upgrade coffee-rails from 4.1.0 to 4.1.1connorshea2016-03-251-2/+2
* | Merge branch 'upgrade-web-console' into 'master' Robert Speicher2016-03-271-1/+1
|\ \
| * | Upgrade web-console to 2.3.0connorshea2016-03-241-1/+4
| |/
* | Merge branch 'upgrade-font-awesome' into 'master' Robert Speicher2016-03-271-2/+2
|\ \
| * | Upgrade font-awesome-rails to 4.5.0.1connorshea2016-03-241-2/+5
| |/
* | Merge branch 'upgrade-brakeman' into 'master' Robert Speicher2016-03-271-11/+8
|\ \
| * | Upgrade Brakeman from 3.1.4 to 3.2.1connorshea2016-03-241-11/+8
| |/
* | Merge branch 'upgrade-teaspoon' into 'master' Robert Speicher2016-03-271-3/+3
|\ \
| * | Upgrade Teaspoon from 1.0.1 to 1.1.5.connorshea2016-03-251-3/+6
| |/
* | Upgrade Bullet to 5.0.0connorshea2016-03-241-1/+4
|/
* Merge branch 'master' into issue_12658Douwe Maan2016-03-211-11/+19
|\
| * Merge branch 'backport-ee-premailer' into 'master' Rémy Coutable2016-03-211-0/+10
| |\
| | * Inline mailer CSS using premailer.Douwe Maan2016-03-191-0/+10
| * | Update Rubocop from 0.35.1 to 0.38.0.connorshea2016-03-201-11/+9
| |/
* | Merge branch 'master' into issue_12658Douwe Maan2016-03-201-4/+11
|\ \ | |/
| * Show a notice for diffs that are too largehide-large-diffsYorick Peterse2016-03-181-3/+3
| * Added omniauth-auth0 Gem + Applicable Documentation.Daniel Carraro2016-03-161-0/+3
| * Support Wiki with UTF-8 page nameHiroyuki Sato2016-03-161-1/+5
* | Merge 4009-external-users into issue_12658Felipe Artur2016-03-161-12/+12
|\ \ | |/
| * Merge branch 'css-style-guide' into 'master' Jacob Schatz2016-03-151-0/+4
| |\
| | * Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add documenta...connorshea2016-03-141-0/+4
| * | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-151-2/+0
| * | Bump gitlab_git to 9.0.3Stan Hu2016-03-141-1/+1
| * | Bump Capybara gem to 2.6.2Stan Hu2016-03-141-2/+3
| |/
| * Merge branch 'omniauth-saml-upgrade' into 'master' Patricio Cano2016-03-111-4/+4
| |\
| | * Upgrade `omniauth-saml` to 1.5.0 and document it's new capabilities.Patricio Cano2016-03-101-4/+4
| |/ |/|
| * Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-03-111-1/+1
| |\ |/ /
| * Updated gitlab_git to 9.0.1Yorick Peterse2016-03-081-1/+1
* | Merge branch 'rs-bump-poltergeist' into 'master' Dmitriy Zaporozhets2016-03-091-2/+2
|\ \
| * | Bump poltergeist to `~> 1.9.0`rs-bump-poltergeistRobert Speicher2016-03-071-2/+2
| |/
* | Retry spinach testsKamil Trzcinski2016-03-091-0/+3
* | Retry failed testsKamil Trzcinski2016-03-091-0/+3
|/
* Merge branch 'issue_2805' into 'master' Douwe Maan2016-03-051-2/+3
|\
| * Upgrade carrierwave to 0.10.0.issue_2805Rubén Dávila2016-03-031-2/+3
* | Bump factory_girl_rails to ~> 4.6.0Robert Speicher2016-03-041-4/+4
* | Update spring to 1.6.4 to fix support for Bundler 1.11Gabriel Mazetto2016-03-031-2/+2
* | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-2/+2
|/
View Lorry Controller Status