summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* remove unneeded eslint exceptionsremove-require-context-boards-bundleMike Greiling2017-02-201-1/+1
* remove require.context from boards_bundleMike Greiling2017-02-201-7/+11
* Merge branch '28204-option-to-disable-webpack-dev-server-livereload' into 'ma...Alfredo Sumaran2017-02-202-0/+6
|\
| * Pick up option from gdk to disable webpack dev server livereload28204-option-to-disable-webpack-dev-server-livereloadEric Eastwood2017-02-152-0/+6
* | Merge branch 'rs-document-timecop' into 'master' Rémy Coutable2017-02-201-0/+19
|\ \
| * | Document Timecop usage for time-sensitive testsrs-document-timecopRobert Speicher2017-02-201-0/+19
* | | Merge branch 'authentiq-backchannel-logout' into 'master' Douwe Maan2017-02-206-4/+26
|\ \ \
| * | | Added support for Authentiq Back-Channel LogoutAlexandros Keramidas2017-02-206-4/+26
* | | | Merge branch 'updated-pages-0.3.1' into 'master' Robert Speicher2017-02-202-1/+5
|\ \ \ \
| * | | | Update GitLab Pages to v0.3.1Nick Thomas2017-02-202-1/+5
* | | | | Merge branch 'artifactsdoc' into 'master'Robert Speicher2017-02-202-3/+32
|\ \ \ \ \
| * | | | | Added documentation for permalinks to most recent build artifactsChristian Godenschwager2017-02-202-3/+32
* | | | | | Merge branch 'pedro-fix-line-ending' into 'master' Clement Ho2017-02-201-1/+1
|\ \ \ \ \ \
| * | | | | | Fix wrong line ending [ci-skip]pedro-fix-line-endingPedro Moreira da Silva2017-02-171-1/+1
* | | | | | | Merge branch 'remove-paginated-ressource' into 'master'Rémy Coutable2017-02-207-44/+6
|\ \ \ \ \ \ \
| * | | | | | | Remove shared example for paginationremove-paginated-ressourceRobert Schilling2017-02-207-44/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'api-star-restful' into 'master'Rémy Coutable2017-02-205-8/+13
|\ \ \ \ \ \ \
| * | | | | | | API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`api-star-restfulRobert Schilling2017-02-205-8/+13
* | | | | | | | Merge branch 'zj-improve-performance-user-agent-details' into 'master' Rémy Coutable2017-02-207-7/+43
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Improve performance of User Agent DetailZ.J. van de Weg2017-02-207-7/+43
| |/ / / / / /
* | | | | | | Merge branch 'fix-vue-production-build' into 'master' Jacob Schatz2017-02-201-2/+1
|\ \ \ \ \ \ \
| * | | | | | | utilize pre-minified Vue in production since no CJS distribution is availablefix-vue-production-buildMike Greiling2017-02-191-2/+1
* | | | | | | | Merge branch 'fix-grammar' into 'master' Robert Speicher2017-02-203-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix some grammar in the API docsRobert Schilling2017-02-203-5/+5
* | | | | | | | | Merge branch 'link-to-rspec-features-docs' into 'master' Rémy Coutable2017-02-201-0/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add more links in the Features/Integration testing documentationRichard Macklin2017-02-131-3/+9
| * | | | | | | | Add link to external documentation of rspec-rails feature specsRichard Macklin2017-02-031-1/+3
* | | | | | | | | Merge branch 'api-post-block' into 'master' Sean McGivern2017-02-207-21/+127
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | API: Use POST to (un)block a userapi-post-blockRobert Schilling2017-02-207-21/+127
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'api-grape-datetime' into 'master' Rémy Coutable2017-02-203-22/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use grape validation for datesapi-grape-datetimeRobert Schilling2017-02-203-22/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '21240_snippets_line_ending' into 'master' Sean McGivern2017-02-209-25/+100
|\ \ \ \ \ \ \
| * | | | | | | Download snippets with LF line-endings by defaultJarka Kadlecova2017-02-209-25/+100
* | | | | | | | Merge branch 'docs/ldap-location' into 'master' Achilleas Pipinellis2017-02-201-3/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Change wording for LDAP doc that was moved to a new locationAchilleas Pipinellis2017-02-201-3/+1
* | | | | | | | | Merge branch 'sh-fix-project-team-truncation-in-destroy' into 'master' Rémy Coutable2017-02-202-2/+20
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Prevent project team from being truncated too early during project destructionsh-fix-project-team-truncation-in-destroyStan Hu2017-02-192-2/+20
* | | | | | | | | Merge branch '28082-deleted-branch-event-404' into 'master'Rémy Coutable2017-02-202-5/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove Link from Push Events for deleted branchesJan Christophersen2017-02-152-5/+7
* | | | | | | | | | Merge branch 'api-remove-deploy-key-disable' into 'master'Sean McGivern2017-02-205-73/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`api-remove-deploy-key-disableRobert Schilling2017-02-205-73/+14
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix_sidekiq_concurrency_warning_message_in_admin_background_job...Rémy Coutable2017-02-203-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix failed spec because haml_lintwendy04022017-02-191-1/+1
| * | | | | | | | | | fix incorrect sidekiq concurrency count in admin background pagewendy04022017-02-193-1/+6
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'remove-imports-loader-window-bind' into 'master' Filipa Lacerda2017-02-20132-143/+129
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix overlooked window binding in spec filesremove-imports-loader-window-bindMike Greiling2017-02-1724-24/+24
| * | | | | | | | | | remove imports loaderMike Greiling2017-02-173-14/+0
| * | | | | | | | | | replace implicit this == window with explicit bindingMike Greiling2017-02-17105-105/+105
* | | | | | | | | | | Merge branch '28295-mr-loading-icon' into 'master' Filipa Lacerda2017-02-202-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | loading icon sometimes toggled alongside MR pipeline contents28295-mr-loading-iconSimon Knox2017-02-192-2/+1