Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'authentiq-backchannel-logout' into 'master' | Douwe Maan | 2017-02-20 | 6 | -4/+26 |
|\ | |||||
| * | Added support for Authentiq Back-Channel Logout | Alexandros Keramidas | 2017-02-20 | 6 | -4/+26 |
* | | Merge branch 'updated-pages-0.3.1' into 'master' | Robert Speicher | 2017-02-20 | 2 | -1/+5 |
|\ \ | |||||
| * | | Update GitLab Pages to v0.3.1 | Nick Thomas | 2017-02-20 | 2 | -1/+5 |
* | | | Merge branch 'artifactsdoc' into 'master' | Robert Speicher | 2017-02-20 | 2 | -3/+32 |
|\ \ \ | |||||
| * | | | Added documentation for permalinks to most recent build artifacts | Christian Godenschwager | 2017-02-20 | 2 | -3/+32 |
* | | | | Merge branch 'pedro-fix-line-ending' into 'master' | Clement Ho | 2017-02-20 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix wrong line ending [ci-skip]pedro-fix-line-ending | Pedro Moreira da Silva | 2017-02-17 | 1 | -1/+1 |
* | | | | | Merge branch 'remove-paginated-ressource' into 'master' | Rémy Coutable | 2017-02-20 | 7 | -44/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Remove shared example for paginationremove-paginated-ressource | Robert Schilling | 2017-02-20 | 7 | -44/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'api-star-restful' into 'master' | Rémy Coutable | 2017-02-20 | 5 | -8/+13 |
|\ \ \ \ \ | |||||
| * | | | | | API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`api-star-restful | Robert Schilling | 2017-02-20 | 5 | -8/+13 |
* | | | | | | Merge branch 'zj-improve-performance-user-agent-details' into 'master' | Rémy Coutable | 2017-02-20 | 7 | -7/+43 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Improve performance of User Agent Detail | Z.J. van de Weg | 2017-02-20 | 7 | -7/+43 |
| |/ / / / | |||||
* | | | | | Merge branch 'fix-vue-production-build' into 'master' | Jacob Schatz | 2017-02-20 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | utilize pre-minified Vue in production since no CJS distribution is availablefix-vue-production-build | Mike Greiling | 2017-02-19 | 1 | -2/+1 |
* | | | | | | Merge branch 'fix-grammar' into 'master' | Robert Speicher | 2017-02-20 | 3 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix some grammar in the API docs | Robert Schilling | 2017-02-20 | 3 | -5/+5 |
* | | | | | | | Merge branch 'link-to-rspec-features-docs' into 'master' | Rémy Coutable | 2017-02-20 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add more links in the Features/Integration testing documentation | Richard Macklin | 2017-02-13 | 1 | -3/+9 |
| * | | | | | | | Add link to external documentation of rspec-rails feature specs | Richard Macklin | 2017-02-03 | 1 | -1/+3 |
* | | | | | | | | Merge branch 'api-post-block' into 'master' | Sean McGivern | 2017-02-20 | 7 | -21/+127 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | API: Use POST to (un)block a userapi-post-block | Robert Schilling | 2017-02-20 | 7 | -21/+127 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'api-grape-datetime' into 'master' | Rémy Coutable | 2017-02-20 | 3 | -22/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Use grape validation for datesapi-grape-datetime | Robert Schilling | 2017-02-20 | 3 | -22/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch '21240_snippets_line_ending' into 'master' | Sean McGivern | 2017-02-20 | 9 | -25/+100 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Download snippets with LF line-endings by default | Jarka Kadlecova | 2017-02-20 | 9 | -25/+100 |
* | | | | | | | Merge branch 'docs/ldap-location' into 'master' | Achilleas Pipinellis | 2017-02-20 | 1 | -3/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Change wording for LDAP doc that was moved to a new location | Achilleas Pipinellis | 2017-02-20 | 1 | -3/+1 |
* | | | | | | | | Merge branch 'sh-fix-project-team-truncation-in-destroy' into 'master' | Rémy Coutable | 2017-02-20 | 2 | -2/+20 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Prevent project team from being truncated too early during project destructionsh-fix-project-team-truncation-in-destroy | Stan Hu | 2017-02-19 | 2 | -2/+20 |
* | | | | | | | | Merge branch '28082-deleted-branch-event-404' into 'master' | Rémy Coutable | 2017-02-20 | 2 | -5/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove Link from Push Events for deleted branches | Jan Christophersen | 2017-02-15 | 2 | -5/+7 |
* | | | | | | | | | Merge branch 'api-remove-deploy-key-disable' into 'master' | Sean McGivern | 2017-02-20 | 5 | -73/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`api-remove-deploy-key-disable | Robert Schilling | 2017-02-20 | 5 | -73/+14 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix_sidekiq_concurrency_warning_message_in_admin_background_job... | Rémy Coutable | 2017-02-20 | 3 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix failed spec because haml_lint | wendy0402 | 2017-02-19 | 1 | -1/+1 |
| * | | | | | | | | | fix incorrect sidekiq concurrency count in admin background page | wendy0402 | 2017-02-19 | 3 | -1/+6 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'remove-imports-loader-window-bind' into 'master' | Filipa Lacerda | 2017-02-20 | 132 | -143/+129 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix overlooked window binding in spec filesremove-imports-loader-window-bind | Mike Greiling | 2017-02-17 | 24 | -24/+24 |
| * | | | | | | | | | remove imports loader | Mike Greiling | 2017-02-17 | 3 | -14/+0 |
| * | | | | | | | | | replace implicit this == window with explicit binding | Mike Greiling | 2017-02-17 | 105 | -105/+105 |
* | | | | | | | | | | Merge branch '28295-mr-loading-icon' into 'master' | Filipa Lacerda | 2017-02-20 | 2 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | loading icon sometimes toggled alongside MR pipeline contents28295-mr-loading-icon | Simon Knox | 2017-02-19 | 2 | -2/+1 |
* | | | | | | | | | | | Merge branch 'patch-13' into 'master' | Rémy Coutable | 2017-02-20 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | exclude rpc_pipefs from system disc info | Ben Bodenmiller | 2017-02-18 | 1 | -0/+1 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'add-additional-checks-to-ca-data' into 'master' | Jacob Schatz | 2017-02-18 | 13 | -28/+166 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Make sure events have most properties definedadd-additional-checks-to-ca-data | Alfredo Sumaran | 2017-02-10 | 5 | -28/+137 |
| * | | | | | | | | | Restore exposure of legend property for events | Alfredo Sumaran | 2017-02-10 | 8 | -0/+29 |
* | | | | | | | | | | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' | Clement Ho | 2017-02-18 | 12 | -149/+214 |
|\ \ \ \ \ \ \ \ \ \ |