summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'rest-of-dispatcher'rest-of-dispatcherClement Ho2018-02-2143-1398/+2437
|\
| * Merge branch 'ce-3776-ci-view-for-sast' into 'master'Phil Hughes2018-02-217-16/+23
| |\
| | * CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18nce-3776-ci-view-for-sastFilipa Lacerda2018-02-207-16/+23
| * | Merge branch 'rebalance-test-job-nodes-28-2' into 'master'Rémy Coutable2018-02-211-63/+63
| |\ \
| | * | Reduce Spinach parallelization to 2 nodes and increase RSpec's to 28 nodesTakuya Noguchi2018-02-011-63/+63
| * | | Merge branch '41461-project-members-slow-due-to-sql' into 'master'Yorick Peterse2018-02-212-12/+50
| |\ \ \
| | * | | More readable SQL query.Andreas Brandl2018-02-211-3/+7
| | * | | Fix MembersFinder to never include group invitees.41461-project-members-slow-due-to-sqlAndreas Brandl2018-02-201-1/+1
| | * | | Fix N+1 query problem for users on members view.Andreas Brandl2018-02-201-1/+1
| | * | | Add changelog.Andreas Brandl2018-02-201-0/+5
| | * | | Use DISTINCT ON and translate to MySQL.Andreas Brandl2018-02-201-16/+34
| | * | | Simplify database queries in MembersFinder.Andreas Brandl2018-02-201-11/+22
| * | | | Merge branch '42877-snippets-dashboard-slow' into 'master'Yorick Peterse2018-02-215-14/+67
| |\ \ \ \
| | * | | | Rename use_conditions_only option to use_where_in.42877-snippets-dashboard-slowAndreas Brandl2018-02-202-4/+4
| | * | | | Avoid manual SQL for visibility level check.Andreas Brandl2018-02-201-1/+1
| | * | | | Cleanup access level shortcut.Andreas Brandl2018-02-203-50/+18
| | * | | | Simplify down migration.Andreas Brandl2018-02-201-1/+1
| | * | | | Add changelog.Andreas Brandl2018-02-201-0/+5
| | * | | | Allow choice between #where or #from.Andreas Brandl2018-02-202-4/+12
| | * | | | Don't mess with table aliases.Andreas Brandl2018-02-201-4/+4
| | * | | | Remove duplication in Project methods.Andreas Brandl2018-02-202-38/+21
| | * | | | Push feature-related query part up.Andreas Brandl2018-02-202-2/+30
| | * | | | Add partial index on projects for index-only scans.Andreas Brandl2018-02-202-1/+23
| | * | | | Shortcut when all levels visible.Andreas Brandl2018-02-203-1/+34
| | * | | | Replace OR clause with UNION.Andreas Brandl2018-02-201-1/+7
| | |/ / /
| * | | | Merge branch 'move-project-pages-to-rspec' into 'master'Rémy Coutable2018-02-213-241/+202
| |\ \ \ \
| | * | | | Move project pages spinach tests to RspecSemyon Pupkov2018-02-213-241/+202
| * | | | | Merge branch 'more-dispatcher-refactoring' into 'master'Jacob Schatz2018-02-2119-119/+35
| |\ \ \ \ \
| | * | | | | use DOMContentLoaded event over jQuery .ready to ensure execution ordermore-dispatcher-refactoringMike Greiling2018-02-211-1/+1
| | * | | | | migrate admin:* to static bundleMike Greiling2018-02-212-4/+1
| | * | | | | migrate omniauth_callbacks:* to static bundleMike Greiling2018-02-212-8/+1
| | * | | | | migrate sessions:* to static bundleMike Greiling2018-02-212-8/+1
| | * | | | | migrate projects:clusters:* to static bundleMike Greiling2018-02-215-16/+14
| | * | | | | migrate dashboard:activity to static bundleMike Greiling2018-02-212-6/+1
| | * | | | | migrate projects:merge_requests:show to static bundleMike Greiling2018-02-211-2/+0
| | * | | | | migrate projects:releases:edit to static bundleMike Greiling2018-02-212-6/+1
| | * | | | | migrate projects:services:edit to static bundleMike Greiling2018-02-212-7/+2
| | * | | | | migrate projects:tags:new to static bundleMike Greiling2018-02-212-7/+2
| | * | | | | migrate projects:snippets:* to static bundleMike Greiling2018-02-214-21/+4
| | * | | | | migrate snippets:show to static bundleMike Greiling2018-02-212-11/+5
| | * | | | | migrate snippets:* to static bundleMike Greiling2018-02-213-22/+2
| | |/ / / /
| * | | | | Merge branch 'docs-project-labels' into 'master'Achilleas Pipinellis2018-02-211-4/+4
| |\ \ \ \ \
| | * | | | | Update wording docs labelsVictor Wu2018-02-211-4/+4
| |/ / / / /
| * | | | | Merge branch 'query-counting-should-not-include-cached-queries' into 'master'Yorick Peterse2018-02-212-10/+27
| |\ \ \ \ \
| | * | | | | Do not count rails sql cache as queries in query limitingquery-counting-should-not-include-cached-queriesDylan Griffith2018-02-212-10/+27
| | |/ / / /
| * | | | | Merge branch 'upgrade-frontend-build-dependencies' into 'master'Tim Zallmann2018-02-213-917/+1966
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | approve change in dependenciesupgrade-frontend-build-dependenciesMike Greiling2018-02-201-0/+6
| | * | | | move babel-eslint to devDependenciesMike Greiling2018-02-201-1/+1
| | * | | | update karma dependenciesMike Greiling2018-02-202-474/+380
| | * | | | approve change in dependenciesMike Greiling2018-02-201-0/+6