summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move Sentry notifications to a Sidekiq processsh-sentry-asyncStan Hu2018-05-265-1/+18
| | | | | | We've seen that the API exception handling can take upwards of 30 seconds to handle. During times where lots of events are occurring, the POST request to the Sentry server could block other requests.
* Merge branch 'leipert-move-ee-specific-pipeline-scss-backport' into 'master'Annabel Gray2018-05-251-41/+61
|\ | | | | | | | | Backport changes of gitlab-ee!5852 See merge request gitlab-org/gitlab-ce!19145
| * backport changes from ↵leipert-move-ee-specific-pipeline-scss-backportLukas Eipert2018-05-251-41/+61
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5852
* | Merge branch 'winh-new-merge-request-encoding' into 'master'Mike Greiling2018-05-253-3/+40
|\ \ | | | | | | | | | | | | | | | | | | Fix encoding of branch names on compare and new merge request page Closes #46627 See merge request gitlab-org/gitlab-ce!19143
| * | Fix indentation in user_selects_branches_for_new_mr_spec.rbwinh-new-merge-request-encodingWinnie Hellmann2018-05-251-2/+2
| | |
| * | Remove duplicate escaping from branch dropdownWinnie Hellmann2018-05-252-1/+6
| | |
| * | Add failing test for https://gitlab.com/gitlab-org/gitlab-ce/issues/46627Winnie Hellmann2018-05-251-2/+34
| | |
* | | Merge branch 'bootstrap4' into 'master'Mike Greiling2018-05-25709-3298/+3119
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Bootstrap 4 Closes #45185 and #46710 See merge request gitlab-org/gitlab-ce!18232
| * | | Add text-secondary colors backClement Ho2018-05-251-0/+5
| | | |
| * | | Fix active sessions card layoutClement Ho2018-05-252-3/+4
| | | |
| * | | Fix login_specAnnabel Dunstone Gray2018-05-251-1/+1
| | | |
| * | | Fix login tabsAnnabel Dunstone Gray2018-05-246-22/+26
| | | |
| * | | Fix new issue page breakpointsAnnabel Dunstone Gray2018-05-243-10/+12
| | | |
| * | | Fix hide whitespace changes buttonClement Ho2018-05-241-1/+1
| | | |
| * | | Revert diff-files-changed sticky barClement Ho2018-05-241-1/+1
| | | |
| * | | Fix admin user projects tableAnnabel Dunstone Gray2018-05-242-3/+3
| | | |
| * | | Merge branch 'master' into bootstrap4Clement Ho2018-05-2477-382/+859
| |\ \ \ | | |/ /
| * | | Fix pagination spec, forgot to add spaceClement Ho2018-05-242-2/+2
| | | |
| * | | Fix pipelines specClement Ho2018-05-241-0/+5
| | | |
| * | | Fix d-sm-block for wiki sidebarClement Ho2018-05-241-1/+1
| | | |
| * | | Replace data-test=page with .js-pagination-pageClement Ho2018-05-243-3/+3
| | | |
| * | | Re-add form-checkClement Ho2018-05-241-4/+5
| | | |
| * | | Fix new project viewAnnabel Dunstone Gray2018-05-242-1/+2
| | | |
| * | | Test remove restore window sizeClement Ho2018-05-241-4/+0
| | | |
| * | | Remove unnecessary milestone additionClement Ho2018-05-241-2/+0
| | | |
| * | | Remove tooltip bootstrap migration additionClement Ho2018-05-241-5/+0
| | | |
| * | | Revert diff notes bundle changeClement Ho2018-05-241-3/+2
| | | |
| * | | Fix group settings layoutAnnabel Dunstone Gray2018-05-242-7/+7
| | | |
| * | | Fix pipeline job tooltipClement Ho2018-05-241-0/+1
| | | |
| * | | Fix collapsed sidebar tooltipsClement Ho2018-05-2410-22/+28
| | | |
| * | | Fix external user badge colorAnnabel Dunstone Gray2018-05-241-0/+5
| | | |
| * | | Replace remaining .radio and .checkbox with .form-checkClement Ho2018-05-243-5/+5
| | | |
| * | | Remove unused btn-group-justifiedClement Ho2018-05-241-4/+0
| | | |
| * | | Update class name to not use bootstrap's text-light classAnnabel Dunstone Gray2018-05-232-2/+2
| | | |
| * | | Fix remove group modalAnnabel Dunstone Gray2018-05-231-1/+1
| | | |
| * | | Fix clone URL alignment on project pageAnnabel Dunstone Gray2018-05-234-10/+12
| | | |
| * | | Fix help text for general settings permissionsClement Ho2018-05-231-1/+1
| | | |
| * | | Restore tooltip arrowsClement Ho2018-05-231-1/+1
| | | |
| * | | fix protected_branches_spec.rbJose2018-05-231-0/+2
| | | |
| * | | Fix members table layoutAnnabel Dunstone Gray2018-05-233-4/+7
| | | |
| * | | Fix bad merge conflictClement Ho2018-05-231-1/+1
| | | |
| * | | Merge branch 'master' into bootstrap4Clement Ho2018-05-2396-360/+1453
| |\ \ \
| * | | | Fix gitlab ci yml linter layoutClement Ho2018-05-231-10/+9
| | | | |
| * | | | Add min-height to form-controlAnnabel Dunstone Gray2018-05-231-0/+6
| | | | |
| * | | | Fix alignment of MR conflict resolutionAnnabel Dunstone Gray2018-05-232-7/+1
| | | | |
| * | | | Fix admin broadcast color formClement Ho2018-05-232-1/+7
| | | | |
| * | | | Fix deploy keys formClement Ho2018-05-231-6/+6
| | | | |
| * | | | Fix bad master mergeClement Ho2018-05-221-1/+1
| | | | |
| * | | | Fix gray colorClement Ho2018-05-221-1/+1
| | | | |
| * | | | Use dropdown-menu instead of dropdown selectorClement Ho2018-05-221-1/+1
| | | | |
View Lorry Controller Status