Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove fixed class from file actions25709-diff-file-overflow | Annabel Dunstone Gray | 2017-01-19 | 2 | -2/+2 |
| | |||||
* | Use flexbox instead of media queries | Filipa Lacerda | 2017-01-19 | 3 | -74/+36 |
| | | | | Move CSS to correct file | ||||
* | Fix haml linter errors | Filipa Lacerda | 2017-01-19 | 1 | -3/+3 |
| | |||||
* | Adds tooltips | Filipa Lacerda | 2017-01-19 | 2 | -3/+7 |
| | |||||
* | Responsive title in diffs inline, side by side, with and without sidebar | Filipa Lacerda | 2017-01-19 | 3 | -3/+79 |
| | | | | Adds MR ID to CHANGELOG entry | ||||
* | Merge branch '26601-dropdown-makes-request-close' into 'master' | Fatih Acet | 2017-01-19 | 3 | -15/+21 |
|\ | | | | | | | | | | | | | Fixes builds dropdown making request when clicked to be closed Closes #26601 See merge request !8545 | ||||
| * | Use bootstrap dropdown events to only make the request when the dropdown is ↵26601-dropdown-makes-request-close | Filipa Lacerda | 2017-01-13 | 3 | -15/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | being opened Fixes builds dropdown making request when clicked to be closed Adds MR ID to CHANGELOG Improve documentation Use bootstrap dropdown events to only make the request when the dropdown is being opened | ||||
* | | Merge branch '26472-math-margin' into 'master' | Fatih Acet | 2017-01-19 | 2 | -1/+5 |
|\ \ | | | | | | | | | | | | | | | | | | | Add margin to math blocks Closes #26472 See merge request !8543 | ||||
| * | | Add margin to math blocks26472-math-margin | Annabel Dunstone Gray | 2017-01-12 | 2 | -1/+5 |
| | | | |||||
* | | | Merge branch 'use-empty_project-factory-in-api-specs' into 'master' | Robert Speicher | 2017-01-19 | 19 | -54/+53 |
|\ \ \ | | | | | | | | | | | | | | | | | Replace many :project with :empty_projects in API specs See merge request !8608 | ||||
| * | | | Replace many :project with :empty_projects in API specsuse-empty_project-factory-in-api-specs | Rémy Coutable | 2017-01-17 | 19 | -54/+53 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch '26810-fix-undefined-method-revert_group_project_commit_path' ↵ | Robert Speicher | 2017-01-19 | 3 | -3/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Ensure group acts as a namespace for polymorphic routes Closes #26810 See merge request !8627 | ||||
| * | | | | Ensure group acts as a namespace for polymorphic routes26810-fix-undefined-method-revert_group_project_commit_path | Rémy Coutable | 2017-01-18 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | Merge branch 'fix-dashboard-spec' into 'master' | Rémy Coutable | 2017-01-19 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix todos spec See merge request !8643 | ||||
| * | | | | | Fix todos spec | Sean McGivern | 2017-01-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was changed in a community MR, but the branch was far enough behind master that it didn't have this spec. | ||||
* | | | | | | Merge branch 'didemacet-markdown-area-height-fix' into 'master' 26874-avatar-misalign-builds-page | Fatih Acet | 2017-01-19 | 3 | -0/+42 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autoresize markdown preview Closes #24372 See merge request !8607 | ||||
| * | | | | | | Autoresize markdown previewdidemacet-markdown-area-height-fix | Clement Ho | 2017-01-17 | 3 | -0/+42 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'feature/gitaly-feature-flag' into 'master' | Robert Speicher | 2017-01-19 | 4 | -1/+41 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly feature flag See merge request !8440 | ||||
| * | | | | | | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flag | Ahmad Sherif | 2017-01-18 | 4 | -1/+41 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'button-alignment' into 'master' | Fatih Acet | 2017-01-19 | 2 | -2/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix small button alignment issues See merge request !8631 | ||||
| * | | | | | | | Fix small button alignment issuesbutton-alignment | Annabel Dunstone Gray | 2017-01-18 | 2 | -2/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'allow-shared-examples-jasmine' into 'master' | Fatih Acet | 2017-01-19 | 4 | -2/+48 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add jasmine helpers and run their specs Closes #26305 See merge request !8437 | ||||
| * | | | | | | | | Add first shared examples to a helper and updated teaspoon_env to allow ↵allow-shared-examples-jasmine | Luke "Jared" Bennett | 2017-01-18 | 4 | -2/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | helper specs to run | ||||
* | | | | | | | | | Merge branch 'brakeman-upgrade' into 'master' | Robert Speicher | 2017-01-19 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Brakeman to 3.4.1 Closes #26820 See merge request !8629 | ||||
| * | | | | | | | | | Upgrade Brakeman to 3.4.1brakeman-upgrade | Brian Neel | 2017-01-18 | 2 | -3/+3 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'simple-eslint-fixes' into 'master' | Fatih Acet | 2017-01-19 | 193 | -1209/+943 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple eslint fixes See merge request !8536 | ||||
| * | | | | | | | | | | resolve all space-in-parens eslint violationssimple-eslint-fixes | Mike Greiling | 2017-01-18 | 4 | -14/+14 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | resolve all prefer-const eslint violations | Mike Greiling | 2017-01-18 | 15 | -47/+44 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | resolve all no-dupe-keys eslint violations | Mike Greiling | 2017-01-18 | 2 | -4/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | resolve all parseInt radix eslint violations | Mike Greiling | 2017-01-18 | 8 | -17/+17 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | resolve all x-spacing and no-spaced-x eslint violations | Mike Greiling | 2017-01-18 | 42 | -178/+184 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | resolve all indent eslint violations | Mike Greiling | 2017-01-18 | 21 | -326/+331 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | resolve all no-trailing-spaces eslint violations | Mike Greiling | 2017-01-18 | 2 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | resolve all no-irregular-whitespace eslint violations | Mike Greiling | 2017-01-18 | 4 | -9/+9 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | resolve all padded-blocks eslint violations | Mike Greiling | 2017-01-18 | 160 | -434/+162 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | resolve all semi and no-extra-semi eslint violations | Mike Greiling | 2017-01-18 | 43 | -285/+285 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | resolve all no-plusplus eslint violations | Mike Greiling | 2017-01-18 | 27 | -96/+96 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'wip-mr-from-commits' into 'master' | Sean McGivern | 2017-01-19 | 12 | -3/+222 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark MR as WIP when pushing WIP commits Closes #25036 See merge request !8124 | ||||
| * | | | | | | | | | | | Show a custom WIP help message for MR's with WIP commits | jurre | 2017-01-19 | 4 | -2/+70 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Mark MR as WIP when pushing WIP commits | jurre | 2017-01-19 | 8 | -1/+152 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'rs-revert-sassc' into 'master' | Robert Speicher | 2017-01-19 | 3 | -17/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'switch-to-sassc' into 'master'" Closes #26762 See merge request !8642 | ||||
| * | | | | | | | | | | | Revert "Merge branch 'switch-to-sassc' into 'master' " | Robert Speicher | 2017-01-19 | 3 | -17/+8 |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1, reversing changes made to 78d710388fbabe27481c77cc353610904465c4df. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26762 | ||||
* | | | | | | | | | | | Merge branch '23563-document-presenters' into 'master' | Dmitriy Zaporozhets | 2017-01-19 | 18 | -3/+530 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document presenters Closes #23563 See merge request !8480 | ||||
| * | | | | | | | | | | | More improvements to presenters23563-document-presenters | Rémy Coutable | 2017-01-18 | 16 | -127/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | | | | Fix typos and improve presenters documentation | Rémy Coutable | 2017-01-18 | 1 | -39/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | | | | Add Presentable concern | Rémy Coutable | 2017-01-18 | 5 | -3/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | | | | Improve presenter factory | Rémy Coutable | 2017-01-18 | 4 | -87/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | | | | Improve presenter architecture | Rémy Coutable | 2017-01-18 | 16 | -139/+288 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | | | | Handle presenters in BasePolicy | Rémy Coutable | 2017-01-18 | 2 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | | | | Document presenters | Rémy Coutable | 2017-01-18 | 9 | -0/+391 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> |