Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '44712-update-asciidoctor-from-1.5.3-to-1.5.6.2' into 'master' | Douwe Maan | 2018-03-28 | 1 | -2/+2 |
|\ | |||||
| * | Update asciidoctor-plantuml to 0.0.8 | Takuya Noguchi | 2018-03-28 | 1 | -1/+1 |
| * | Update asciidoctor to 1.5.6.2 | Takuya Noguchi | 2018-03-28 | 1 | -1/+1 |
* | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master' | Kamil TrzciĆski | 2018-03-28 | 1 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ce | Alessio Caiazza | 2018-03-27 | 1 | -2/+2 |
* | | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master' | Douwe Maan | 2018-03-27 | 1 | -0/+1 |
|\ \ | |/ |/| | |||||
| * | Adds JWT omnianuth integration | Tiago Botelho | 2018-03-20 | 1 | -0/+1 |
* | | Merge branch 'update-omniauth-twitter' into 'master' | Douwe Maan | 2018-03-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update omniauth-twitter 1.2.0 -> 1.4 | Pirate Praveen | 2018-03-20 | 1 | -1/+1 |
| |/ | |||||
* | | Bump `state_machines-activerecord` to `0.5.1` | blackst0ne | 2018-03-26 | 1 | -1/+1 |
* | | Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4sh-update-loofah | Stan Hu | 2018-03-22 | 1 | -1/+1 |
* | | Merge branch 'master' into 'latest-security-to-master-21-03-18' | James Lopez | 2018-03-22 | 1 | -6/+19 |
|\ \ | |||||
| * \ | Merge branch 'update-omniauth' into 'master' | Robert Speicher | 2018-03-21 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Update omniauth 1.4.2 -> 1.8 | Pirate Praveen | 2018-03-21 | 1 | -1/+1 |
| * | | | Merge branch 'blackst0ne-rails5-add-second-gemfile' into 'master' | Robert Speicher | 2018-03-21 | 1 | -5/+18 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | [Rails5] Add Gemfile.rails5blackst0ne-rails5-add-second-gemfile | blackst0ne | 2018-03-15 | 1 | -5/+18 |
* | | | | Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6' | James Lopez | 2018-03-21 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'update-licensee' into 'master' | Douwe Maan | 2018-03-21 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update licensee 8.7.0 -> 8.9 | Pirate Praveen | 2018-03-19 | 1 | -1/+1 |
* | | | | Merge branch 'update-gettext_i18n_rails_js' into 'master' | Douwe Maan | 2018-03-21 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Update gettext_i18n_rails_js 1.2.0 -> 1.3 | Pirate Praveen | 2018-03-16 | 1 | -1/+1 |
* | | | | Show Ajax requests in performance bar | Sean McGivern | 2018-03-19 | 1 | -1/+0 |
* | | | | Merge branch 'update-google-api-client' into 'master' | Robert Speicher | 2018-03-19 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Update google-api-client | Pirate Praveen | 2018-03-16 | 1 | -1/+1 |
* | | | | Merge branch 'update-doorkeeper-openid_connect' into 'master' | Douwe Maan | 2018-03-19 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Update doorkeeper-openid_connect and doorkeeper | Pirate Praveen | 2018-03-16 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch 'remove-oj' into 'master' | Robert Speicher | 2018-03-19 | 1 | -3/+0 |
|\ \ \ \ | |||||
| * | | | | Remove oj as we're not using it | Lin Jen-Shin | 2018-03-19 | 1 | -3/+0 |
* | | | | | Merge branch 'update-omniauth-saml' into 'master' | Douwe Maan | 2018-03-19 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Relax omniauth-saml | Pirate Praveen | 2018-03-15 | 1 | -1/+1 |
* | | | | | Merge branch 'master' into 'update-kubeclient' | Grzegorz Bizon | 2018-03-17 | 1 | -13/+12 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'update-flipper' into 'master' | Grzegorz Bizon | 2018-03-16 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | Update flipper 0.11.0 -> 0.13.0 | Pirate Praveen | 2018-03-13 | 1 | -3/+3 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch '44235-update-knapsack-to-1.16.0' into 'master' | Grzegorz Bizon | 2018-03-16 | 1 | -1/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Update knapsack to 1.16.0 | Takuya Noguchi | 2018-03-14 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Revert "Merge branch 'update-httparty' into 'master'" | Stan Hu | 2018-03-16 | 1 | -1/+1 |
| * | | | Remove jquery-rails from Gemfile | Balasankar "Balu" C | 2018-03-15 | 1 | -1/+0 |
| | |/ | |/| | |||||
| * | | Merge branch 'update-net-ssh' into 'master' | Douwe Maan | 2018-03-14 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734) | Pirate Praveen | 2018-03-14 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch '43806-update-ruby-saml-to-1.7.2' into 'master' | Robert Speicher | 2018-03-14 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0 | Takuya Noguchi | 2018-03-14 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'update-fog-aws' into 'master' | Robert Speicher | 2018-03-14 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | update fog-aws 1.4 -> 2.0 | Pirate Praveen | 2018-03-13 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'update-acts-as-taggable-on' into 'master' | Robert Speicher | 2018-03-14 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Update acts-as-taggable-on to 5.0 | Pirate Praveen | 2018-03-12 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'update-sentry-raven' into 'master' | Douwe Maan | 2018-03-14 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029) | Pirate Praveen | 2018-03-13 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'update-octokit' into 'master' | Douwe Maan | 2018-03-14 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Update octokit 4.6.2 -> 4.8 | Pirate Praveen | 2018-03-14 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'update-ruby-prof' into 'master' | Robert Speicher | 2018-03-14 | 1 | -1/+1 |
| |\ \ |