Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs-fix-implicit-div' into 'master' 25725-remove-window-object | Robert Speicher | 2017-01-04 | 1 | -1/+1 |
|\ | |||||
| * | Fix ImplicitDiv Haml lint failure | Robert Speicher | 2017-01-04 | 1 | -1/+1 |
* | | Merge branch 'mrchrisw-repack-not-gc' into 'master' | Jacob Vosmaer (GitLab) | 2017-01-04 | 1 | -7/+19 |
|\ \ | |/ |/| | |||||
| * | Clarify git housekeepingmrchrisw-repack-not-gc | Chris Wilson | 2016-12-30 | 1 | -7/+19 |
* | | Merge branch 'recaptcha_500' into 'master' | Rémy Coutable | 2017-01-04 | 3 | -23/+57 |
|\ \ | |||||
| * | | Properly handle failed reCAPTCHA on user registration | Drew Blessing | 2017-01-03 | 3 | -23/+57 |
* | | | Merge branch 'add_email_password_confirmation' into 'master' | Douwe Maan | 2017-01-04 | 6 | -18/+31 |
|\ \ \ | |||||
| * | | | Add email and password confirmation fields to registration form | Drew Blessing | 2017-01-03 | 6 | -18/+31 |
* | | | | Merge branch 'rs-remove-unused-method' into 'master' | Douwe Maan | 2017-01-04 | 2 | -12/+0 |
|\ \ \ \ | |||||
| * | | | | Remove unused `Project#web_url_without_protocol` methodrs-remove-unused-method | Robert Speicher | 2017-01-03 | 2 | -12/+0 |
* | | | | | Merge branch 'review-commits-and-commit-scss' into 'master' | Jacob Schatz | 2017-01-04 | 16 | -290/+261 |
|\ \ \ \ \ | |||||
| * | | | | | Remove double border from compare pagereview-commits-and-commit-scss | Annabel Dunstone Gray | 2016-12-29 | 1 | -0/+8 |
| * | | | | | Update file hader styles; remove and relocate more commits css | Annabel Dunstone Gray | 2016-12-29 | 11 | -172/+119 |
| * | | | | | Add table styling to commits tables | Annabel Dunstone Gray | 2016-12-29 | 5 | -41/+68 |
| * | | | | | Start commits refactor | Annabel Dunstone Gray | 2016-12-29 | 5 | -173/+161 |
* | | | | | | Merge branch 'api-refactor-issues-filter' into 'master' | Sean McGivern | 2017-01-04 | 1 | -21/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add missing milestone parameter | Robert Schilling | 2017-01-04 | 1 | -0/+1 |
| * | | | | | | Refactor issues filter in API | Robert Schilling | 2017-01-04 | 1 | -21/+7 |
* | | | | | | | Merge branch 'api-hooks-changelog-entry' into 'master' | Sean McGivern | 2017-01-04 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add changelog entry for renaming API param [ci skip] | Robert Schilling | 2017-01-04 | 1 | -0/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'fix-api-project-hooks-params' into 'master' | Sean McGivern | 2017-01-04 | 2 | -3/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix project hooks paramsfix-api-project-hooks-params | Robert Schilling | 2017-01-03 | 2 | -3/+4 |
* | | | | | | | Merge branch 'ldap_person_attributes' into 'master' include-uncovered-jasmine | Robert Speicher | 2017-01-03 | 3 | -2/+65 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Gitlab::LDAP::Person uses LDAP attributes configuration | Drew Blessing | 2017-01-03 | 3 | -2/+65 |
* | | | | | | | Merge branch '25580-trucate-dropdown-for-long-branch' into 'master' | Fatih Acet | 2017-01-03 | 4 | -8/+42 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fixes js lint warnings25580-trucate-dropdown-for-long-branch | Nur Rony | 2016-12-31 | 1 | -4/+3 |
| * | | | | | | | changelog entry added | Nur Rony | 2016-12-31 | 1 | -0/+4 |
| * | | | | | | | trucates text to prevent overflow and adds tooltip to it | Nur Rony | 2016-12-31 | 2 | -4/+12 |
| * | | | | | | | fixes mobile views | Nur Rony | 2016-12-31 | 1 | -4/+27 |
* | | | | | | | | Merge branch '25836-changing-from-version-in-diff-comparison-does-not-preserv... | Fatih Acet | 2017-01-03 | 3 | -2/+51 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-version | Sam Rose | 2016-12-31 | 3 | -2/+51 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch '25964-label-autocomplete-doesn-t-handle-spaces-after' into 'mas... | Fatih Acet | 2017-01-03 | 1 | -8/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove unneeded prevention code25964-label-autocomplete-doesn-t-handle-spaces-after | Luke "Jared" Bennett | 2016-12-27 | 1 | -8/+1 |
| * | | | | | | | | Fixes #22058 and #23578 | Yann Gravrand | 2016-12-27 | 1 | -1/+3 |
* | | | | | | | | | Merge branch '26168-emoji-reactions-missing-tooltip-when-not-logged-in' into ... | Fatih Acet | 2017-01-03 | 5 | -10/+23 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Disable award emoji button but display tooltip26168-emoji-reactions-missing-tooltip-when-not-logged-in | Sam Rose | 2016-12-31 | 5 | -10/+23 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'additional-award-emoji-repositioning-fixes' into 'master' | Annabel Dunstone Gray | 2017-01-03 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Removed bottom padding from merge manually from CLI because of repositioning ...additional-award-emoji-repositioning-fixes | dimitrieh | 2017-01-02 | 2 | -1/+5 |
* | | | | | | | | | | Merge branch 'regression-note-headline-light' into 'master' | Annabel Dunstone Gray | 2017-01-03 | 2 | -2/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixed regression of note-headline-light where it was always placed on 2 lines...regression-note-headline-light | dimitrieh | 2016-12-30 | 2 | -2/+14 |
* | | | | | | | | | | | Merge branch 'use-stable-icon-url' into 'master' | Kamil Trzciński | 2017-01-03 | 4 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Rename logo, apply for Slack too | Z.J. van de Weg | 2017-01-03 | 4 | -2/+8 |
| * | | | | | | | | | | | Add logo in public files | Z.J. van de Weg | 2017-01-03 | 2 | -1/+1 |
| * | | | | | | | | | | | Use stable icon for Mattermost integration | Kamil Trzcinski | 2017-01-03 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'zj-revert-polymorphic-url' into 'master' | Kamil Trzciński | 2017-01-03 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Revert specific URLzj-revert-polymorphic-url | Z.J. van de Weg | 2016-12-27 | 1 | -3/+3 |
* | | | | | | | | | | | | Merge branch 'project-avatar-fork' into 'master' | Sean McGivern | 2017-01-03 | 5 | -7/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Don't delete files from spec/fixtures | Jacob Vosmaer | 2017-01-03 | 1 | -3/+3 |
| * | | | | | | | | | | | Copy, don't move uploaded avatar files | Jacob Vosmaer | 2017-01-03 | 4 | -4/+32 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fix/cross-project-ref-path' into 'master' | Sean McGivern | 2017-01-03 | 21 | -55/+73 |
|\ \ \ \ \ \ \ \ \ \ \ |