summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pravi/gitlab-ce-update-recaptcha' into 'master'Rémy Coutable2019-03-131-1/+1
|\
| * Update recaptcha 3.0 -> 4.11Pirate Praveen2019-03-081-1/+1
* | Prefer node_modules At.js and jquery.carat versionsMike Greiling2019-03-131-1/+0
* | Update rack-oauth2 1.2.1 -> 1.9.3Pirate Praveen2019-03-121-1/+1
* | Remove select2-rails (select2 is now installed via yarn)Mike Greiling2019-03-081-1/+0
|/
* Revert "Merge branch 'remove-select2-rails' into 'master'"Marin Jankovski2019-03-081-0/+1
* remove select2-rails (select2 is now installed via yarn)Praveen Arimbrathodiyil2019-03-081-1/+0
* Accept force option on commit via APIPatrick Bajao2019-03-061-1/+1
* Merge branch 'add_ldap_tls_options' into 'master'Douwe Maan2019-03-051-1/+1
|\
| * Allow raw `tls_options` to be passed in LDAP configurationDrew Blessing2019-03-041-1/+1
* | Bump Bootsnap to 1.4.1Stan Hu2019-03-011-1/+1
|/
* Add a monkey patch that will squelch warnings for legacy Fog gemsStan Hu2019-02-281-1/+3
* Bump fog-aws to 3.3.0 and associated dependenciesStan Hu2019-02-281-6/+6
* Support merge to ref for merge-commit and squashOswaldo Ferreira2019-02-251-1/+2
* Merge branch 'dz-bump-version-sorter' into 'master'Stan Hu2019-02-221-1/+1
|\
| * Bump version_sorter to version 2.2.4Dmitriy Zaporozhets2019-02-221-1/+1
* | Upgrade Webmock to 3.5.1Stan Hu2019-02-161-1/+1
* | Update Unicorn and associated gemsStan Hu2019-02-141-1/+1
|/
* Update sshkey to v2.0.0Nick Thomas2019-02-111-1/+1
* Remove HipChat integration from GitLabNick Thomas2019-02-081-3/+0
* Merge branch 'sh-log-project-name-with-gitaly' into 'master'Rémy Coutable2019-02-061-1/+1
|\
| * Rename gl_project_name -> gl_project_pathsh-log-project-name-with-gitalyStan Hu2019-02-051-1/+1
* | Merge branch 'chore/update-js-regex' into 'master'Stan Hu2019-02-061-1/+1
|\ \ | |/ |/|
| * update js_regex versionRoger Rüttimann2019-01-141-1/+1
* | Remove Redcarpet markdown engineJan Provaznik2019-02-041-1/+0
* | Merge branch '19745-forms-with-task-lists-can-be-overwritten-when-editing-sim...Sean McGivern2019-02-041-1/+1
|\ \
| * | Bump up tasklist package to v2.2.0Fatih Acet2019-01-301-1/+1
| * | Use original tasklist package with new versionFatih Acet2019-01-301-1/+1
| * | Temporarily use tasklist from fatihacet’s forkFatih Acet2019-01-301-1/+1
* | | Fix requiring the rubyzip GemYorick Peterse2019-01-311-1/+1
* | | Fix uninitialized constant with GitLab Pages deployStan Hu2019-01-311-1/+1
* | | Extract GitLab Pages using RubyZipKamil Trzciński2019-01-311-0/+1
|/ /
* | Use http_max_redirects opt to replace monkeypatchThong Kuah2019-01-251-1/+1
* | Merge branch '26375-markdown-footnotes-not-working' into 'master'Lin Jen-Shin2019-01-171-2/+2
|\ \
| * | Update to nokogiri 1.10.1Brett Walker2019-01-171-1/+1
| * | Update nokogiri to 1.10.0Brett Walker2019-01-081-2/+2
* | | Conditionally initialize the global opentracing tracerAndrew Newdigate2019-01-171-0/+6
* | | Update sidekiq-cron 0.6.0 -> 1.0Pirate Praveen2019-01-161-2/+2
| |/ |/|
* | Fix ambiguous brackets in task listsJared Deckard2019-01-111-1/+1
|/
* Merge branch 'update-pg' into 'master'Rémy Coutable2019-01-081-1/+1
|\
| * Update pg to ~> 1.1Pirate Praveen2018-12-271-1/+1
* | Merge branch 'sh-bump-mini-test' into 'master'Lin Jen-Shin2019-01-031-1/+1
|\ \
| * | Bump minitest to 5.11.3 to match Gitaly versionsh-bump-mini-testStan Hu2018-12-301-1/+1
| |/
* | Update gems in Gemfile and qa/Gemfile to be consistentStan Hu2019-01-021-4/+4
* | Merge branch 'blackst0ne-bump-rails-cve-2018-16476' into 'master'Grzegorz Bizon2019-01-021-1/+1
|\ \
| * | Bump Ruby on Rails to 5.0.7.1blackst0ne-bump-rails-cve-2018-16476blackst0ne2018-12-211-1/+1
* | | Merge branch 'sh-bump-omniauth-google-gem' into 'master'Sean McGivern2019-01-011-2/+2
|\ \ \
| * | | Upgrade Omniauth and JWT gems to switch away from Google+ APIStan Hu2018-12-281-2/+2
| | |/ | |/|
* | | Merge branch 'rails52-dbcleaner' into 'master'Stan Hu2018-12-311-1/+1
|\ \ \ | |/ / |/| |
| * | Bump database_cleaner versionJan Provaznik2018-12-211-1/+1
View Lorry Controller Status