summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-1881-34/+475
* Merge branch 'update-user_uses_slash_commands_spec' into 'master'Rémy Coutable2017-09-181-4/+4
|\
| * Minor update to address Sean McGivern's comment.manolis2017-09-151-4/+4
* | Merge branch 'replace_project_snippets.feature' into 'master'Rémy Coutable2017-09-187-135/+95
|\ \
| * | Replace the 'project/snippets.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-187-135/+95
* | | Merge branch '37957-fix-groups-members-flyout-link' into 'master'Phil Hughes2017-09-181-1/+1
|\ \ \
| * | | Use correct group members path for members flyout link37957-fix-groups-members-flyout-linkkushalpandya2017-09-181-1/+1
| |/ /
* | | Merge branch 'fix_wiki_md' into 'master'Achilleas Pipinellis2017-09-181-0/+2
|\ \ \
| * | | Fix broken link in docs/api/wiki.mdVitaliy @blackst0ne Klachkov2017-09-171-0/+2
* | | | Merge branch 'operation-service-merge' into 'master'Rémy Coutable2017-09-188-78/+76
|\ \ \ \
| * | | | Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-158-78/+76
* | | | | Merge branch 'fix-dev-ssl' into 'master'Grzegorz Bizon2017-09-181-1/+1
|\ \ \ \ \
| * | | | | Never connect to webpack-dev-server over SSLfix-dev-sslAlessio Caiazza2017-09-151-1/+1
* | | | | | Merge branch '24121_extract_yet_another_users_finder' into 'master'Grzegorz Bizon2017-09-184-40/+169
|\ \ \ \ \ \
| * | | | | | add Mayra Cabrera to authors of changeMaxim Rydkin2017-09-101-1/+1
| * | | | | | move `find_users` method into finder and add `load_group` methodMaxim Rydkin2017-09-103-28/+58
| * | | | | | rename yet_another_users_finder into autocomplete_users_finderMaxim Rydkin2017-09-103-3/+3
| * | | | | | fix rubocopMaxim Rydkin2017-09-101-8/+7
| * | | | | | adds changelogMaxim Rydkin2017-09-101-0/+5
| * | | | | | finish spec/finders/yet_another_users_finder_spec.rbMaxim Rydkin2017-09-101-54/+42
| * | | | | | extract finder and add first testMaxim Rydkin2017-09-103-22/+129
* | | | | | | Merge branch 'replace_project_commits_revert.feature' into 'master'Rémy Coutable2017-09-184-73/+61
|\ \ \ \ \ \ \
| * | | | | | | Replace the 'project/commits/revert.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-184-73/+61
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |