| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce | James Edwards-Jones | 2017-02-06 | 1 | -6/+3 |
|\ |
|
| * | fix rack-proxy dependency in productionfix-rack-proxy | Mike Greiling | 2017-02-04 | 1 | -2/+2 |
| * | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-02-03 | 1 | -2/+1 |
| |\ |
|
| | * | Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master'
| Jacob Schatz | 2017-02-03 | 1 | -1/+0 |
| | |\ |
|
| | | * | Remove turbolinks. | Bryce Johnson | 2017-02-02 | 1 | -1/+0 |
| * | | | add rack middleware to proxy webpack dev server | Mike Greiling | 2017-02-01 | 1 | -0/+2 |
| * | | | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-01-31 | 1 | -1/+1 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-01-28 | 1 | -0/+1 |
| |\ \ \ |
|
| * | | | | remove sprockets-es6 and execjs dependencies | Mike Greiling | 2017-01-28 | 1 | -1/+0 |
| * | | | | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-01-27 | 1 | -4/+4 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'master' into go-go-gadget-webpack | Phil Hughes | 2017-01-17 | 1 | -4/+2 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'master' into go-go-gadget-webpack | Phil Hughes | 2017-01-13 | 1 | -16/+20 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | remove remaining vestiges of teaspoon test runner | Mike Greiling | 2017-01-10 | 1 | -4/+0 |
| * | | | | | | | add webpack, webpack-rails, and webpack-dev-server along with a simple hello ... | Mike Greiling | 2017-01-06 | 1 | -0/+2 |
* | | | | | | | | Merge branch 'master' into jej-pages-picked-from-ee | James Edwards-Jones | 2017-02-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \
| | |_|_|_|_|_|/
| |/| | | | | | |
|
| * | | | | | | | PlantUML support for Markdown | Horacio Sanson | 2017-02-03 | 1 | -1/+1 |
| | |_|_|_|_|/
| |/| | | | | |
|
* | | | | | | | Update validates_hostname to 1.0.6 to fix a bug in parsing hexadecimal-lookin... | Nick Thomas | 2017-02-01 | 1 | -1/+1 |
* | | | | | | | Initial work on GitLab Pages update | Kamil Trzcinski | 2017-01-31 | 1 | -0/+3 |
|/ / / / / / |
|
* | | | | | | Update and pin the `jwt` gem to ~> 1.5.627488-fix-jwt-version | Rémy Coutable | 2017-01-31 | 1 | -1/+1 |
| |_|_|_|/
|/| | | | |
|
* | | | | | Add the rspec_profiling gem and documentation to the GitLab development envir...23034-enable-rspec-profiling | Nick Thomas | 2017-01-27 | 1 | -0/+1 |
| |_|_|/
|/| | | |
|
* | | | | Merge branch 'refresh-authorizations-fork-join' into 'master'
| Douwe Maan | 2017-01-25 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-join | Yorick Peterse | 2017-01-25 | 1 | -1/+1 |
* | | | | | Merge branch 'upgrade-omniauth' into 'security'
| Robert Speicher | 2017-01-23 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Merge branch 'brakeman-upgrade' into 'master'
| Robert Speicher | 2017-01-19 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Upgrade Brakeman to 3.4.1brakeman-upgrade | Brian Neel | 2017-01-18 | 1 | -1/+1 |
| | |_|/
| |/| | |
|
* | | | | Revert "Merge branch 'switch-to-sassc' into 'master'
" | Robert Speicher | 2017-01-19 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge branch 'switch-to-sassc' into 'master'
| Robert Speicher | 2017-01-17 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Switch to sassc-rails | Richard Macklin | 2017-01-16 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Merge branch '19633-remove-rerun' into 'master'
| Robert Speicher | 2017-01-17 | 1 | -1/+0 |
|\ \ \ |
|
| * | | | Remove rerun since it's not used anymore19633-remove-rerun | Rémy Coutable | 2017-01-16 | 1 | -1/+0 |
| |/ / |
|
* | | | Update ffaker to ~>2.4 to avoid generating names with suffixes26492-fix-transient-failure-in-commits_spec | Rémy Coutable | 2017-01-16 | 1 | -1/+1 |
|/ / |
|
* | | Update gitlab-markup back to 1.5.1 in Gemfile26627-update-gitlab-markup-to-1-5-1-again | Rémy Coutable | 2017-01-12 | 1 | -1/+1 |
* | | Add support for PlantUML diagrams in Asciidoc. | Horacio Sanson | 2017-01-12 | 1 | -12/+13 |
* | | Merge branch 'patch-turbolinks' into 'security' | Robert Speicher | 2017-01-10 | 1 | -2/+1 |
* | | Merge branch 'update-rubocop' into 'master'
| Sean McGivern | 2017-01-10 | 1 | -2/+2 |
|\ \ |
|
| * | | Update rubocop and rubocop-rspec to fix build errorsupdate-rubocop | Brian Neel | 2017-01-06 | 1 | -2/+2 |
| |/ |
|
* | | Update the gitlab-markup gem to the version `1.5.1` | Douglas Barbosa Alexandre | 2017-01-09 | 1 | -1/+1 |
* | | Re-add Google Cloud Storage as a backup strategysupport-google-cloud-storage-backups | Rémy Coutable | 2017-01-06 | 1 | -0/+4 |
|/ |
|
* | Absorb gitlab_git | Robert Speicher | 2017-01-04 | 1 | -4/+2 |
* | Update octokit to 4.6.2 | Manuel Rüger | 2016-12-30 | 1 | -1/+1 |
* | Merge branch 'mrchrisw-update-vmstat' into 'master'
| Stan Hu | 2016-12-28 | 1 | -1/+1 |
|\ |
|
| * | Update vmstat to version 2.3.0mrchrisw-update-vmstat | Chris Wilson | 2016-12-27 | 1 | -1/+1 |
* | | switch to email_reply_trimmer from discourse | http://jneen.net/ | 2016-12-21 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'authentiq-id-oauth-support' into 'master'
| Rémy Coutable | 2016-12-21 | 1 | -0/+1 |
|\ |
|
| * | Added support for Authentiq oauth provider | Alex | 2016-12-21 | 1 | -0/+1 |
* | | Merge branch 'zj-kamil-slack-slash-commands' into 'master'
| Grzegorz Bizon | 2016-12-20 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | Create Slack Slash command service | Z.J. van de Weg | 2016-12-16 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2 | Douglas Barbosa Alexandre | 2016-12-16 | 1 | -1/+4 |
|\ \
| |/ |
|
| * | Merge branch 'gem-update-grape' into 'master'
| Rémy Coutable | 2016-12-16 | 1 | -1/+1 |
| |\ |
|
| | * | Update grape to 0.18.0gem-update-grape | Robert Schilling | 2016-12-14 | 1 | -1/+1 |