summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix the failing spec in POST /users APIfix-users-api-500-errorRémy Coutable2017-01-052-7/+8
* Add a failing spec to the POST /users APIRémy Coutable2017-01-041-0/+8
* Merge branch 'recaptcha_500' into 'master' Rémy Coutable2017-01-043-23/+57
|\
| * Properly handle failed reCAPTCHA on user registrationDrew Blessing2017-01-033-23/+57
* | Merge branch 'add_email_password_confirmation' into 'master' Douwe Maan2017-01-046-18/+31
|\ \
| * | Add email and password confirmation fields to registration formDrew Blessing2017-01-036-18/+31
* | | Merge branch 'rs-remove-unused-method' into 'master' Douwe Maan2017-01-042-12/+0
|\ \ \
| * | | Remove unused `Project#web_url_without_protocol` methodrs-remove-unused-methodRobert Speicher2017-01-032-12/+0
* | | | Merge branch 'review-commits-and-commit-scss' into 'master' Jacob Schatz2017-01-0416-290/+261
|\ \ \ \
| * | | | Remove double border from compare pagereview-commits-and-commit-scssAnnabel Dunstone Gray2016-12-291-0/+8
| * | | | Update file hader styles; remove and relocate more commits cssAnnabel Dunstone Gray2016-12-2911-172/+119
| * | | | Add table styling to commits tablesAnnabel Dunstone Gray2016-12-295-41/+68
| * | | | Start commits refactorAnnabel Dunstone Gray2016-12-295-173/+161
* | | | | Merge branch 'api-refactor-issues-filter' into 'master' Sean McGivern2017-01-041-21/+8
|\ \ \ \ \
| * | | | | Add missing milestone parameterRobert Schilling2017-01-041-0/+1
| * | | | | Refactor issues filter in APIRobert Schilling2017-01-041-21/+7
* | | | | | Merge branch 'api-hooks-changelog-entry' into 'master' Sean McGivern2017-01-041-0/+4
|\ \ \ \ \ \
| * | | | | | Add changelog entry for renaming API param [ci skip]Robert Schilling2017-01-041-0/+4
| |/ / / / /
* | | | | | Merge branch 'fix-api-project-hooks-params' into 'master' Sean McGivern2017-01-042-3/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix project hooks paramsfix-api-project-hooks-paramsRobert Schilling2017-01-032-3/+4
* | | | | | Merge branch 'ldap_person_attributes' into 'master' include-uncovered-jasmineRobert Speicher2017-01-033-2/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Gitlab::LDAP::Person uses LDAP attributes configurationDrew Blessing2017-01-033-2/+65
* | | | | | Merge branch '25580-trucate-dropdown-for-long-branch' into 'master' Fatih Acet2017-01-034-8/+42
|\ \ \ \ \ \
| * | | | | | fixes js lint warnings25580-trucate-dropdown-for-long-branchNur Rony2016-12-311-4/+3
| * | | | | | changelog entry addedNur Rony2016-12-311-0/+4
| * | | | | | trucates text to prevent overflow and adds tooltip to itNur Rony2016-12-312-4/+12
| * | | | | | fixes mobile viewsNur Rony2016-12-311-4/+27
* | | | | | | Merge branch '25836-changing-from-version-in-diff-comparison-does-not-preserv...Fatih Acet2017-01-033-2/+51
|\ \ \ \ \ \ \
| * | | | | | | Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-versionSam Rose2016-12-313-2/+51
| |/ / / / / /
* | | | | | | Merge branch '25964-label-autocomplete-doesn-t-handle-spaces-after' into 'mas...Fatih Acet2017-01-031-8/+3
|\ \ \ \ \ \ \
| * | | | | | | Remove unneeded prevention code25964-label-autocomplete-doesn-t-handle-spaces-afterLuke "Jared" Bennett2016-12-271-8/+1
| * | | | | | | Fixes #22058 and #23578Yann Gravrand2016-12-271-1/+3
* | | | | | | | Merge branch '26168-emoji-reactions-missing-tooltip-when-not-logged-in' into ...Fatih Acet2017-01-035-10/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable award emoji button but display tooltip26168-emoji-reactions-missing-tooltip-when-not-logged-inSam Rose2016-12-315-10/+23
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'additional-award-emoji-repositioning-fixes' into 'master' Annabel Dunstone Gray2017-01-032-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed bottom padding from merge manually from CLI because of repositioning ...additional-award-emoji-repositioning-fixesdimitrieh2017-01-022-1/+5
* | | | | | | | | Merge branch 'regression-note-headline-light' into 'master' Annabel Dunstone Gray2017-01-032-2/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed regression of note-headline-light where it was always placed on 2 lines...regression-note-headline-lightdimitrieh2016-12-302-2/+14
* | | | | | | | | | Merge branch 'use-stable-icon-url' into 'master' Kamil Trzciński2017-01-034-2/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename logo, apply for Slack tooZ.J. van de Weg2017-01-034-2/+8
| * | | | | | | | | | Add logo in public filesZ.J. van de Weg2017-01-032-1/+1
| * | | | | | | | | | Use stable icon for Mattermost integrationKamil Trzcinski2017-01-031-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'zj-revert-polymorphic-url' into 'master' Kamil Trzciński2017-01-031-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert specific URLzj-revert-polymorphic-urlZ.J. van de Weg2016-12-271-3/+3
* | | | | | | | | | | Merge branch 'project-avatar-fork' into 'master' Sean McGivern2017-01-035-7/+35
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Don't delete files from spec/fixturesJacob Vosmaer2017-01-031-3/+3
| * | | | | | | | | | Copy, don't move uploaded avatar filesJacob Vosmaer2017-01-034-4/+32
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/cross-project-ref-path' into 'master' Sean McGivern2017-01-0321-55/+73
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-0321-55/+73
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-double-line-issuable-page' into 'master' Annabel Dunstone Gray2017-01-031-0/+6
|\ \ \ \ \ \ \ \ \ \