summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'replace_project_archived.feature' into 'master'Rémy Coutable2017-09-184-66/+48
|\
| * Replace the 'project/archived.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-174-66/+48
* | Merge branch 'update-test-images' into 'master'Tim Zallmann2017-09-183-38/+164
|\ \
| * | dedupe yarn packagesupdate-test-imagesMike Greiling2017-09-161-36/+126
| * | add dependency approvals (all MIT license)Mike Greiling2017-09-161-0/+36
| * | update build image to latest with node 8.x, yarn 1.0.2, and chrome 61Mike Greiling2017-09-161-2/+2
* | | Merge branch 'improve_spec_features_profiles_specs' into 'master'Rémy Coutable2017-09-188-38/+39
|\ \ \
| * | | Improve 'spec/features/profiles/*' specsVitaliy @blackst0ne Klachkov2017-09-168-38/+39
* | | | Merge branch 'replace_search.feature' into 'master'Rémy Coutable2017-09-1815-526/+564
|\ \ \ \
| * | | | Replace the 'search.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-1615-526/+564
| |/ / /
* | | | Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master'Douwe Maan2017-09-186-0/+386
|\ \ \ \
| * | | | Reduce batch sizemk-delete-conflicting-redirects-mysqlMichael Kozono2017-09-142-5/+7
| * | | | Spread out the work a littleMichael Kozono2017-09-144-10/+117
| * | | | Extract helper for queuing background jobsMichael Kozono2017-09-144-34/+113
| * | | | Simplify queryMichael Kozono2017-09-141-15/+4
| * | | | Add specs for deleting conflicting redirectsMichael Kozono2017-09-144-3/+94
| * | | | Delete conflicting redirects in backgroundMichael Kozono2017-09-142-0/+118
* | | | | Merge branch 'role-badge-fix' into 'master'Douwe Maan2017-09-181-1/+1
|\ \ \ \ \
| * | | | | IssueNotes: Fix role badge styling.role-badge-fixFatih Acet2017-09-141-1/+1
* | | | | | Merge branch '37857-build-header-gap' into 'master'Phil Hughes2017-09-182-7/+7
|\ \ \ \ \ \
| * | | | | | Remove gaps under nav on build pageAnnabel Dunstone Gray2017-09-182-7/+7
|/ / / / / /
* | | | | | Merge branch 'docs-replace-pipelines-cicd' into 'master'Achilleas Pipinellis2017-09-186-17/+17
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 'docs-replace-pipelines-cicd'Achilleas Pipinellis2017-09-18384-4667/+7147
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'Robert Speicher2017-09-171-2/+29
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'fix-sidebar-with-scrollbars' into 'master'Annabel Dunstone Gray2017-09-164-9/+23
|\ \ \ \ \ \
| * | | | | | Fixed the new sidebars width when browser has scrollbarsPhil Hughes2017-09-164-9/+23
|/ / / / / /
* | | | | | Merge branch 'issue_37640' into 'master'Grzegorz Bizon2017-09-166-6/+67
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'master' into 'issue_37640'issue_37640Felipe Artur2017-09-15310-3656/+5781
| |\ \ \ \ \
| * | | | | | Add data migrationFelipe Artur2017-09-153-2/+35
| * | | | | | Fix project feature being deleted when updating project with invalid visibili...Felipe Artur2017-09-125-5/+33
* | | | | | | Merge branch 'rs-default-user-entity' into 'master'Stan Hu2017-09-161-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Ensure we use `Entities::User` for non-admin `users/:id` API requestsRobert Speicher2017-09-151-1/+1
|/ / / / / /
* | | | | | Merge branch 'grpc-1.6' into 'master'Robert Speicher2017-09-151-1/+1
|\ \ \ \ \ \
| * | | | | | Use grpc 1.6.0grpc-1.6Jacob Vosmaer2017-09-141-1/+1
* | | | | | | Merge branch 'fix-share-with-group-lock-update' into 'master'Robert Speicher2017-09-154-4/+51
|\ \ \ \ \ \ \
| * | | | | | | Fix setting share_with_group_lockfix-share-with-group-lock-updateYorick Peterse2017-09-154-4/+51
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '35917_create_services_for_keys' into 'master'Rémy Coutable2017-09-1518-49/+103
|\ \ \ \ \ \ \
| * | | | | | | created services for keyshaseeb2017-09-1518-49/+103
|/ / / / / / /
* | | | | | | Merge branch '21331-improve-confusing-compare-page' into 'master'Phil Hughes2017-09-155-17/+28
|\ \ \ \ \ \ \
| * | | | | | | Make the labels in the Compare form less confusing21331-improve-confusing-compare-pageRémy Coutable2017-09-155-17/+28
| |/ / / / / /
* | | | | | | Merge branch 'projects-controller-show' into 'master'Rémy Coutable2017-09-157-16/+121
|\ \ \ \ \ \ \
| * | | | | | | Memoize the latest builds of a pipelineprojects-controller-showYorick Peterse2017-09-144-15/+42
| * | | | | | | Memoize pipelines for project download buttonsYorick Peterse2017-09-144-1/+79
* | | | | | | | Merge branch 'winh-protected-branch-modal-merged' into 'master'36436-repo-button-back-button-not-consistentPhil Hughes2017-09-154-5/+20
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Display whether branch has been merged when deleting protected branchWinnie Hellmann2017-09-154-5/+20
|/ / / / / / /
* | | | | | | Merge branch 'revert-sidebar-title-attribute' into 'master'Filipa Lacerda2017-09-157-48/+39
|\ \ \ \ \ \ \
| * | | | | | | fixed merge request specrevert-sidebar-title-attributePhil Hughes2017-09-131-1/+1
| * | | | | | | Remove title attribute from sidebar elementsPhil Hughes2017-09-136-47/+38
* | | | | | | | Merge branch 'docs/environment-vars-clarify' into 'master'Rémy Coutable2017-09-153-57/+69
|\ \ \ \ \ \ \ \
| * | | | | | | | Clarify what variables can be used under `environment:`docs/environment-vars-clarifyAchilleas Pipinellis2017-09-143-57/+69