summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-500-for-invalid-upload-path' into 'master'Sean McGivern2018-02-223-1/+14
|\
| * Fix 500 error when loading an invalid upload URLSean McGivern2018-02-223-1/+14
* | Merge branch 'revert-3487441b' into 'master'Sean McGivern2018-02-221-4/+1
|\ \
| * | Revert "Merge branch 'tc-info-version-check' into 'master'"revert-3487441bVictor Wu2018-02-211-4/+1
* | | Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-jsRémy Coutable2018-02-2222-44/+58
* | | Fix the groupLabelsPath in app/assets/javascripts/api.jsRémy Coutable2018-02-221-1/+1
* | | Merge branch '42886-followup-to-new-design-for-cancel-stop-pipeline-confirmat...Filipa Lacerda2018-02-225-148/+93
|\ \ \
| * \ \ Merge branch 'master' into 42886-followup-to-new-design-for-cancel-stop-pipel...42886-followup-to-new-design-for-cancel-stop-pipeline-confirmationShah El-Rahman2018-02-21249-1108/+936
| |\ \ \
| * | | | Remove use of callback in pipeline stop/retry modalsShah El-Rahman2018-02-165-148/+93
* | | | | Merge branch '43134-reduce-queries-pipelines-controller-show' into 'master'Grzegorz Bizon2018-02-221-1/+1
|\ \ \ \ \
| * | | | | Add inverse_of pipeline -> statuses -> pipeline (#43134)43134-reduce-queries-pipelines-controller-showDylan Griffith2018-02-221-1/+1
* | | | | | Merge branch 'dispatcher-import-batch-1' into 'master'Jacob Schatz2018-02-2112-80/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use dynamic imports in dispatcherClement Ho2018-02-2112-80/+20
* | | | | | Rest of Dispatcher RefactorJacob Schatz2018-02-2145-202/+188
|/ / / / /
* | | | | Use dynamic imports for project dispatcher pathsClement Ho2018-02-2112-75/+39
* | | | | #28481: Display time tracking totals on milestone pageRiccardo Padovani2018-02-215-15/+47
| |_|/ / |/| | |
* | | | Merge branch 'tc-info-version-check' into 'master'Sean McGivern2018-02-211-1/+4
|\ \ \ \
| * | | | Add more info about data collected when version check is enabledtc-info-version-checkToon Claes2018-02-211-1/+4
| |/ / /
* | | | Merge branch 'fix/new-project-path-input-overlapping' into 'master'Clement Ho2018-02-212-2/+2
|\ \ \ \
| * | | | Fix new project path input overlappingGeorge Tsiolis2018-02-142-2/+2
* | | | | Merge branch 'fix/change-event-body-label-font-size' into 'master'Clement Ho2018-02-215-8/+10
|\ \ \ \ \
| * | | | | Apply new default and inline label designGeorge Tsiolis2018-02-155-8/+10
* | | | | | Merge branch '26039-Update-to-github-linguist5.3.x' into 'master'Robert Speicher2018-02-211-1/+1
|\ \ \ \ \ \
| * | | | | | 26039 - update github-linguist to 5.3.3 versionKen2018-02-211-1/+1
* | | | | | | Merge branch '35418-remove-underline-for-avatar' into 'master'Clement Ho2018-02-212-1/+5
|\ \ \ \ \ \ \
| * | | | | | | 35418 - remove avatar underlineKen2018-02-202-1/+5
* | | | | | | | Merge branch 'refactor-issuable-finder-to-use-inheritance' into 'master'Rémy Coutable2018-02-218-78/+107
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Refactor IssuableFinder to extract model-specific logicrefactor-issuable-finder-to-use-inheritanceSean McGivern2018-02-218-78/+107
* | | | | | | | Merge branch 'ce-3776-ci-view-for-sast' into 'master'Phil Hughes2018-02-215-14/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18nce-3776-ci-view-for-sastFilipa Lacerda2018-02-205-14/+22
* | | | | | | | | Merge branch '41461-project-members-slow-due-to-sql' into 'master'Yorick Peterse2018-02-211-12/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
| * | | | | | | | | 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-212-13/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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-201-22/+17
| * | | | | | | | | 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
| * | | | | | | | | Shortcut when all levels visible.Andreas Brandl2018-02-201-0/+6
| * | | | | | | | | Replace OR clause with UNION.Andreas Brandl2018-02-201-1/+7
| |/ / / / / / / /
* | | | | | | | | 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
View Lorry Controller Status