summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-061-6/+3
|\
| * fix rack-proxy dependency in productionfix-rack-proxyMike Greiling2017-02-041-2/+2
| * Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-031-2/+1
| |\
| | * Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master' Jacob Schatz2017-02-031-1/+0
| | |\
| | | * Remove turbolinks.Bryce Johnson2017-02-021-1/+0
| * | | add rack middleware to proxy webpack dev serverMike Greiling2017-02-011-0/+2
| * | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-311-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-281-0/+1
| |\ \ \
| * | | | remove sprockets-es6 and execjs dependenciesMike Greiling2017-01-281-1/+0
| * | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-271-4/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-171-4/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-131-16/+20
| |\ \ \ \ \ \
| * | | | | | | remove remaining vestiges of teaspoon test runnerMike Greiling2017-01-101-4/+0
| * | | | | | | add webpack, webpack-rails, and webpack-dev-server along with a simple hello ...Mike Greiling2017-01-061-0/+2
* | | | | | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-031-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | PlantUML support for MarkdownHoracio Sanson2017-02-031-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Update validates_hostname to 1.0.6 to fix a bug in parsing hexadecimal-lookin...Nick Thomas2017-02-011-1/+1
* | | | | | | Initial work on GitLab Pages updateKamil Trzcinski2017-01-311-0/+3
|/ / / / / /
* | | | | | Update and pin the `jwt` gem to ~> 1.5.627488-fix-jwt-versionRémy Coutable2017-01-311-1/+1
| |_|_|_|/ |/| | | |
* | | | | Add the rspec_profiling gem and documentation to the GitLab development envir...23034-enable-rspec-profilingNick Thomas2017-01-271-0/+1
| |_|_|/ |/| | |
* | | | Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-251-1/+1
|\ \ \ \
| * | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-251-1/+1
* | | | | Merge branch 'upgrade-omniauth' into 'security' Robert Speicher2017-01-231-1/+1
|/ / / /
* | | | Merge branch 'brakeman-upgrade' into 'master' Robert Speicher2017-01-191-1/+1
|\ \ \ \
| * | | | Upgrade Brakeman to 3.4.1brakeman-upgradeBrian Neel2017-01-181-1/+1
| | |_|/ | |/| |
* | | | Revert "Merge branch 'switch-to-sassc' into 'master' "Robert Speicher2017-01-191-1/+1
|/ / /
* | | Merge branch 'switch-to-sassc' into 'master' Robert Speicher2017-01-171-1/+1
|\ \ \
| * | | Switch to sassc-railsRichard Macklin2017-01-161-1/+1
| | |/ | |/|
* | | Merge branch '19633-remove-rerun' into 'master' Robert Speicher2017-01-171-1/+0
|\ \ \
| * | | Remove rerun since it's not used anymore19633-remove-rerunRémy Coutable2017-01-161-1/+0
| |/ /
* | | Update ffaker to ~>2.4 to avoid generating names with suffixes26492-fix-transient-failure-in-commits_specRémy Coutable2017-01-161-1/+1
|/ /
* | Update gitlab-markup back to 1.5.1 in Gemfile26627-update-gitlab-markup-to-1-5-1-againRémy Coutable2017-01-121-1/+1
* | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-12/+13
* | Merge branch 'patch-turbolinks' into 'security'Robert Speicher2017-01-101-2/+1
* | Merge branch 'update-rubocop' into 'master' Sean McGivern2017-01-101-2/+2
|\ \
| * | Update rubocop and rubocop-rspec to fix build errorsupdate-rubocopBrian Neel2017-01-061-2/+2
| |/
* | Update the gitlab-markup gem to the version `1.5.1`Douglas Barbosa Alexandre2017-01-091-1/+1
* | Re-add Google Cloud Storage as a backup strategysupport-google-cloud-storage-backupsRémy Coutable2017-01-061-0/+4
|/
* Absorb gitlab_gitRobert Speicher2017-01-041-4/+2
* Update octokit to 4.6.2Manuel Rüger2016-12-301-1/+1
* Merge branch 'mrchrisw-update-vmstat' into 'master' Stan Hu2016-12-281-1/+1
|\
| * Update vmstat to version 2.3.0mrchrisw-update-vmstatChris Wilson2016-12-271-1/+1
* | switch to email_reply_trimmer from discoursehttp://jneen.net/2016-12-211-1/+1
|/
* Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable2016-12-211-0/+1
|\
| * Added support for Authentiq oauth providerAlex2016-12-211-0/+1
* | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-201-1/+1
|\ \ | |/ |/|
| * Create Slack Slash command serviceZ.J. van de Weg2016-12-161-1/+1
* | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-161-1/+4
|\ \ | |/
| * Merge branch 'gem-update-grape' into 'master' Rémy Coutable2016-12-161-1/+1
| |\
| | * Update grape to 0.18.0gem-update-grapeRobert Schilling2016-12-141-1/+1
View Lorry Controller Status