summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Show 'too many changes' message for merge requestissue_25017Felipe Artur2017-01-128-22/+64
|
* Merge branch 'recaptcha_500' into 'master' Rémy Coutable2017-01-043-23/+57
|\ | | | | | | | | Properly handle failed reCAPTCHA on user registration See merge request !8403
| * Properly handle failed reCAPTCHA on user registrationDrew Blessing2017-01-033-23/+57
| | | | | | | | | | | | | | | | If a user presses the 'Register' button too quickly after attempting to solve the reCAPTCHA, or the reCAPTCHA is not solved at all, the user would experience a 500 error. Now, the case is properly handled and the user will be sent back to the registration page with a clear error message and can try again.
* | Merge branch 'add_email_password_confirmation' into 'master' Douwe Maan2017-01-046-18/+31
|\ \ | | | | | | | | | | | | | | | | | | Add email confirmation field to registration form Closes #3053 See merge request !7432
| * | Add email and password confirmation fields to registration formDrew Blessing2017-01-036-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's too easy to mistype an email or password when signing up. The support team is receiving an increasing number of requests because users mistype their email. We can eliminate this problem by requiring users to confirm the email before registering. The same issue can occur for the password field so we should add this, too. We should note that password confirmation is part of the default Devise forms. I don't know why/when GitLab removed it.
* | | Merge branch 'rs-remove-unused-method' into 'master' Douwe Maan2017-01-042-12/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove unused `Project#web_url_without_protocol` method See merge request !8416
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Review commits and commit scss See merge request !8010
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor issues filter in API See merge request !8432
| * | | | | 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 See merge request !8433
| * | | | | | 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 params Closes #26291 See merge request !8425
| * | | | | 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 configuration Closes #26290 See merge request !8418
| * | | | | Gitlab::LDAP::Person uses LDAP attributes configurationDrew Blessing2017-01-033-2/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We allow users to configure LDAP attribute preferences. For example, email can be configured to use `mail`, `email` and `userPrincipalName`, falling through to the next until a value is found. Prior to this change, Gitlab::LDAP::Person did not honor this configuration. Now, the class will honor `name` and `mail` configuration. It does not handle `username`, or fallback to `first_name` + `last_name` in the absence of `name`.
* | | | | | Merge branch '25580-trucate-dropdown-for-long-branch' into 'master' Fatih Acet2017-01-034-8/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves overflow of dropdown text for long branch name Closes #25580 See merge request !8118
| * | | | | | 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 ↵Fatih Acet2017-01-033-2/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25836-changing-from-version-in-diff-comparison-does-not-preserve-to-version' into 'master' Resolve changing "from" version in diff comparison does not preserve "to" version Closes #25836 See merge request !8328
| * | | | | | | 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 ↵Fatih Acet2017-01-031-8/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Label autocomplete doesn't handle spaces after `~~`" Closes #25964, #22058, and #23578 See merge request !8254
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Disable award emoji button but display tooltip Closes #26168 See merge request !8382
| * | | | | | | | 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 award emoji's See merge request !8398
| * | | | | | | | Removed bottom padding from merge manually from CLI because of repositioning ↵additional-award-emoji-repositioning-fixesdimitrieh2017-01-022-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | award emoji's
* | | | | | | | | 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, e… See merge request !8348
| * | | | | | | | | Fixed regression of note-headline-light where it was always placed on 2 ↵regression-note-headline-lightdimitrieh2016-12-302-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lines, even on wide viewports
* | | | | | | | | | Merge branch 'use-stable-icon-url' into 'master' Kamil Trzciński2017-01-034-2/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use stable icon for Mattermost integration See merge request !8252
| * | | | | | | | | | 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 URL See merge request !8321
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy, don't move uploaded avatar files Closes #26158 See merge request !8396
| * | | | | | | | | | 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 reference Closes #25890 See merge request !8232
| * | | | | | | | | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-0321-55/+73
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
* | | | | | | | | | Merge branch 'fix-double-line-issuable-page' into 'master' Annabel Dunstone Gray2017-01-031-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove bottom border from Issuable titles See merge request !8278
| * | | | | | | | | | Remove bottom border from issuable titlesfix-double-line-issuable-pageAlfredo Sumaran2016-12-301-0/+6
| | | | | | | | | | |
View Lorry Controller Status