Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Backport EE changes on approvals reset for closed MRsbackport-ee-1051-approvals-reset-on-closed-mr | Oswaldo Ferreira | 2017-01-23 | 4 | -39/+52 |
* | Merge branch '26810-fix-undefined-method-revert_group_project_commit_path' in... | Robert Speicher | 2017-01-19 | 3 | -3/+5 |
|\ | |||||
| * | 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 |
* | | Merge branch 'fix-dashboard-spec' into 'master' | Rémy Coutable | 2017-01-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix todos spec | Sean McGivern | 2017-01-19 | 1 | -1/+1 |
* | | | Merge branch 'didemacet-markdown-area-height-fix' into 'master' 26874-avatar-misalign-builds-page | Fatih Acet | 2017-01-19 | 3 | -0/+42 |
|\ \ \ | |||||
| * | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 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 first shared examples to a helper and updated teaspoon_env to allow helpe...allow-shared-examples-jasmine | Luke "Jared" Bennett | 2017-01-18 | 4 | -2/+48 |
* | | | | | | | Merge branch 'brakeman-upgrade' into 'master' | Robert Speicher | 2017-01-19 | 2 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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' " | Robert Speicher | 2017-01-19 | 3 | -17/+8 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch '23563-document-presenters' into 'master' | Dmitriy Zaporozhets | 2017-01-19 | 18 | -3/+530 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | More improvements to presenters23563-document-presenters | Rémy Coutable | 2017-01-18 | 16 | -127/+102 |
| * | | | | | | | | | Fix typos and improve presenters documentation | Rémy Coutable | 2017-01-18 | 1 | -39/+28 |
| * | | | | | | | | | Add Presentable concern | Rémy Coutable | 2017-01-18 | 5 | -3/+28 |
| * | | | | | | | | | Improve presenter factory | Rémy Coutable | 2017-01-18 | 4 | -87/+64 |
| * | | | | | | | | | Improve presenter architecture | Rémy Coutable | 2017-01-18 | 16 | -139/+288 |
| * | | | | | | | | | Handle presenters in BasePolicy | Rémy Coutable | 2017-01-18 | 2 | -0/+21 |
| * | | | | | | | | | Document presenters | Rémy Coutable | 2017-01-18 | 9 | -0/+391 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'patch-9' into 'master' | Fatih Acet | 2017-01-19 | 1 | -10/+68 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix markdown errors.patch-9 | Bryce Johnson | 2016-12-21 | 1 | -2/+2 |
| * | | | | | | | | | Add documentation for possible causes of JS-related test failures. | Bryce Johnson | 2016-12-21 | 1 | -10/+68 |
* | | | | | | | | | | Merge branch 'milestone-issuable-row-numbers' into 'master' | Fatih Acet | 2017-01-19 | 2 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Replaced `.pull-right` with `.right`milestone-issuable-row-numbers | Phil Hughes | 2017-01-18 | 1 | -1/+2 |
| * | | | | | | | | | | Fixed some HAML errors on milestone#show | Phil Hughes | 2017-01-13 | 2 | -3/+1 |
* | | | | | | | | | | | Merge branch '26803-typing-then-tab-in-a-comment-doesn-t-select-the-author' i... | Fatih Acet | 2017-01-19 | 3 | -1/+106 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed highlightFirst and added specs26803-typing-then-tab-in-a-comment-doesn-t-select-the-author | Luke "Jared" Bennett | 2017-01-18 | 3 | -1/+106 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'input-button-hover' into 'master' | Fatih Acet | 2017-01-19 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add hover state to MR comment reply buttoninput-button-hover | Annabel Dunstone Gray | 2017-01-12 | 2 | -1/+5 |