summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Bumps omniauth google oauth2 gem versionbump-omniauth-google-oauth2-gem-versionTiago Botelho2018-03-281-1/+1
* Merge branch 'zj-remote-repo-exists' into 'master'Sean McGivern2018-03-281-1/+1
|\
| * Test if remote repository exists before cloningZeger-Jan van de Weg2018-03-271-1/+1
* | Merge branch '44712-update-asciidoctor-from-1.5.3-to-1.5.6.2' into 'master'Douwe Maan2018-03-281-2/+2
|\ \
| * | Update asciidoctor-plantuml to 0.0.8Takuya Noguchi2018-03-281-1/+1
| * | Update asciidoctor to 1.5.6.2Takuya Noguchi2018-03-281-1/+1
* | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-281-2/+2
|\ \ \ | |/ / |/| |
| * | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-271-2/+2
| |/
* | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'Douwe Maan2018-03-271-0/+1
|\ \ | |/ |/|
| * Adds JWT omnianuth integrationTiago Botelho2018-03-201-0/+1
* | Merge branch 'update-omniauth-twitter' into 'master'Douwe Maan2018-03-261-1/+1
|\ \
| * | Update omniauth-twitter 1.2.0 -> 1.4Pirate Praveen2018-03-201-1/+1
| |/
* | Bump `state_machines-activerecord` to `0.5.1`blackst0ne2018-03-261-1/+1
* | Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4sh-update-loofahStan Hu2018-03-221-1/+1
* | Merge branch 'master' into 'latest-security-to-master-21-03-18'James Lopez2018-03-221-6/+19
|\ \
| * \ Merge branch 'update-omniauth' into 'master'Robert Speicher2018-03-211-1/+1
| |\ \
| | * | Update omniauth 1.4.2 -> 1.8Pirate Praveen2018-03-211-1/+1
| * | | Merge branch 'blackst0ne-rails5-add-second-gemfile' into 'master'Robert Speicher2018-03-211-5/+18
| |\ \ \ | | |/ / | |/| |
| | * | [Rails5] Add Gemfile.rails5blackst0ne-rails5-add-second-gemfileblackst0ne2018-03-151-5/+18
* | | | Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'James Lopez2018-03-211-1/+1
|/ / /
* | | Merge branch 'update-licensee' into 'master'Douwe Maan2018-03-211-1/+1
|\ \ \
| * | | Update licensee 8.7.0 -> 8.9Pirate Praveen2018-03-191-1/+1
* | | | Merge branch 'update-gettext_i18n_rails_js' into 'master'Douwe Maan2018-03-211-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update gettext_i18n_rails_js 1.2.0 -> 1.3Pirate Praveen2018-03-161-1/+1
* | | | Show Ajax requests in performance barSean McGivern2018-03-191-1/+0
* | | | Merge branch 'update-google-api-client' into 'master'Robert Speicher2018-03-191-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Update google-api-clientPirate Praveen2018-03-161-1/+1
* | | | Merge branch 'update-doorkeeper-openid_connect' into 'master'Douwe Maan2018-03-191-2/+2
|\ \ \ \
| * | | | Update doorkeeper-openid_connect and doorkeeperPirate Praveen2018-03-161-2/+2
| |/ / /
* | | | Merge branch 'remove-oj' into 'master'Robert Speicher2018-03-191-3/+0
|\ \ \ \
| * | | | Remove oj as we're not using itLin Jen-Shin2018-03-191-3/+0
* | | | | Merge branch 'update-omniauth-saml' into 'master'Douwe Maan2018-03-191-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Relax omniauth-samlPirate Praveen2018-03-151-1/+1
* | | | | Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon2018-03-171-13/+12
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'update-flipper' into 'master'Grzegorz Bizon2018-03-161-3/+3
| |\ \ \ \
| | * | | | Update flipper 0.11.0 -> 0.13.0Pirate Praveen2018-03-131-3/+3
| | | |_|/ | | |/| |
| * | | | Merge branch '44235-update-knapsack-to-1.16.0' into 'master'Grzegorz Bizon2018-03-161-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Update knapsack to 1.16.0Takuya Noguchi2018-03-141-1/+1
| | |/ /
| * | | Revert "Merge branch 'update-httparty' into 'master'"Stan Hu2018-03-161-1/+1
| * | | Remove jquery-rails from GemfileBalasankar "Balu" C2018-03-151-1/+0
| | |/ | |/|
| * | Merge branch 'update-net-ssh' into 'master'Douwe Maan2018-03-141-1/+1
| |\ \
| | * | Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734)Pirate Praveen2018-03-141-1/+1
| | |/
| * | Merge branch '43806-update-ruby-saml-to-1.7.2' into 'master'Robert Speicher2018-03-141-1/+1
| |\ \
| | * | Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0Takuya Noguchi2018-03-141-1/+1
| | |/
| * | Merge branch 'update-fog-aws' into 'master'Robert Speicher2018-03-141-1/+1
| |\ \
| | * | update fog-aws 1.4 -> 2.0Pirate Praveen2018-03-131-1/+1
| | |/
| * | Merge branch 'update-acts-as-taggable-on' into 'master'Robert Speicher2018-03-141-1/+1
| |\ \
| | * | Update acts-as-taggable-on to 5.0Pirate Praveen2018-03-121-1/+1
| | |/
| * | Merge branch 'update-sentry-raven' into 'master'Douwe Maan2018-03-141-1/+1
| |\ \
| | * | Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029)Pirate Praveen2018-03-131-1/+1
| | |/
View Lorry Controller Status