Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'replace_project_archived.feature' into 'master' | Rémy Coutable | 2017-09-18 | 4 | -66/+48 |
|\ | |||||
| * | Replace the 'project/archived.feature' spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-17 | 4 | -66/+48 |
* | | Merge branch 'update-test-images' into 'master' | Tim Zallmann | 2017-09-18 | 3 | -38/+164 |
|\ \ | |||||
| * | | dedupe yarn packagesupdate-test-images | Mike Greiling | 2017-09-16 | 1 | -36/+126 |
| * | | add dependency approvals (all MIT license) | Mike Greiling | 2017-09-16 | 1 | -0/+36 |
| * | | update build image to latest with node 8.x, yarn 1.0.2, and chrome 61 | Mike Greiling | 2017-09-16 | 1 | -2/+2 |
* | | | Merge branch 'improve_spec_features_profiles_specs' into 'master' | Rémy Coutable | 2017-09-18 | 8 | -38/+39 |
|\ \ \ | |||||
| * | | | Improve 'spec/features/profiles/*' specs | Vitaliy @blackst0ne Klachkov | 2017-09-16 | 8 | -38/+39 |
* | | | | Merge branch 'replace_search.feature' into 'master' | Rémy Coutable | 2017-09-18 | 15 | -526/+564 |
|\ \ \ \ | |||||
| * | | | | Replace the 'search.feature' spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-16 | 15 | -526/+564 |
| |/ / / | |||||
* | | | | Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master' | Douwe Maan | 2017-09-18 | 6 | -0/+386 |
|\ \ \ \ | |||||
| * | | | | Reduce batch sizemk-delete-conflicting-redirects-mysql | Michael Kozono | 2017-09-14 | 2 | -5/+7 |
| * | | | | Spread out the work a little | Michael Kozono | 2017-09-14 | 4 | -10/+117 |
| * | | | | Extract helper for queuing background jobs | Michael Kozono | 2017-09-14 | 4 | -34/+113 |
| * | | | | Simplify query | Michael Kozono | 2017-09-14 | 1 | -15/+4 |
| * | | | | Add specs for deleting conflicting redirects | Michael Kozono | 2017-09-14 | 4 | -3/+94 |
| * | | | | Delete conflicting redirects in background | Michael Kozono | 2017-09-14 | 2 | -0/+118 |
* | | | | | Merge branch 'role-badge-fix' into 'master' | Douwe Maan | 2017-09-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | IssueNotes: Fix role badge styling.role-badge-fix | Fatih Acet | 2017-09-14 | 1 | -1/+1 |
* | | | | | | Merge branch '37857-build-header-gap' into 'master' | Phil Hughes | 2017-09-18 | 2 | -7/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove gaps under nav on build page | Annabel Dunstone Gray | 2017-09-18 | 2 | -7/+7 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'docs-replace-pipelines-cicd' into 'master' | Achilleas Pipinellis | 2017-09-18 | 6 | -17/+17 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into 'docs-replace-pipelines-cicd' | Achilleas Pipinellis | 2017-09-18 | 384 | -4667/+7147 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0' | Robert Speicher | 2017-09-17 | 1 | -2/+29 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge branch 'fix-sidebar-with-scrollbars' into 'master' | Annabel Dunstone Gray | 2017-09-16 | 4 | -9/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed the new sidebars width when browser has scrollbars | Phil Hughes | 2017-09-16 | 4 | -9/+23 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'issue_37640' into 'master' | Grzegorz Bizon | 2017-09-16 | 6 | -6/+67 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Merge branch 'master' into 'issue_37640'issue_37640 | Felipe Artur | 2017-09-15 | 310 | -3656/+5781 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add data migration | Felipe Artur | 2017-09-15 | 3 | -2/+35 |
| * | | | | | | Fix project feature being deleted when updating project with invalid visibili... | Felipe Artur | 2017-09-12 | 5 | -5/+33 |
* | | | | | | | Merge branch 'rs-default-user-entity' into 'master' | Stan Hu | 2017-09-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Ensure we use `Entities::User` for non-admin `users/:id` API requests | Robert Speicher | 2017-09-15 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'grpc-1.6' into 'master' | Robert Speicher | 2017-09-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use grpc 1.6.0grpc-1.6 | Jacob Vosmaer | 2017-09-14 | 1 | -1/+1 |
* | | | | | | | Merge branch 'fix-share-with-group-lock-update' into 'master' | Robert Speicher | 2017-09-15 | 4 | -4/+51 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix setting share_with_group_lockfix-share-with-group-lock-update | Yorick Peterse | 2017-09-15 | 4 | -4/+51 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch '35917_create_services_for_keys' into 'master' | Rémy Coutable | 2017-09-15 | 18 | -49/+103 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | created services for keys | haseeb | 2017-09-15 | 18 | -49/+103 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '21331-improve-confusing-compare-page' into 'master' | Phil Hughes | 2017-09-15 | 5 | -17/+28 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make the labels in the Compare form less confusing21331-improve-confusing-compare-page | Rémy Coutable | 2017-09-15 | 5 | -17/+28 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'projects-controller-show' into 'master' | Rémy Coutable | 2017-09-15 | 7 | -16/+121 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Memoize the latest builds of a pipelineprojects-controller-show | Yorick Peterse | 2017-09-14 | 4 | -15/+42 |
| * | | | | | | | Memoize pipelines for project download buttons | Yorick Peterse | 2017-09-14 | 4 | -1/+79 |
* | | | | | | | | Merge branch 'winh-protected-branch-modal-merged' into 'master'36436-repo-button-back-button-not-consistent | Phil Hughes | 2017-09-15 | 4 | -5/+20 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Display whether branch has been merged when deleting protected branch | Winnie Hellmann | 2017-09-15 | 4 | -5/+20 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'revert-sidebar-title-attribute' into 'master' | Filipa Lacerda | 2017-09-15 | 7 | -48/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fixed merge request specrevert-sidebar-title-attribute | Phil Hughes | 2017-09-13 | 1 | -1/+1 |
| * | | | | | | | Remove title attribute from sidebar elements | Phil Hughes | 2017-09-13 | 6 | -47/+38 |
* | | | | | | | | Merge branch 'docs/environment-vars-clarify' into 'master' | Rémy Coutable | 2017-09-15 | 3 | -57/+69 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Clarify what variables can be used under `environment:`docs/environment-vars-clarify | Achilleas Pipinellis | 2017-09-14 | 3 | -57/+69 |