Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix dead link in Reply by email documentationfix-link-reply-by-email | Achilleas Pipinellis | 2017-01-06 | 1 | -2/+2 |
| | |||||
* | Merge branch 'api-refactor-issues-filter' into 'master' | Sean McGivern | 2017-01-04 | 1 | -21/+8 |
|\ | | | | | | | | | Refactor issues filter in API See merge request !8432 | ||||
| * | 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 See merge request !8433 | ||||
| * | | 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 params Closes #26291 See merge request !8425 | ||||
| * | 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 Closes #26290 See merge request !8418 | ||||
| * | Gitlab::LDAP::Person uses LDAP attributes configuration | Drew Blessing | 2017-01-03 | 3 | -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 Acet | 2017-01-03 | 4 | -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-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 ↵ | Fatih Acet | 2017-01-03 | 3 | -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-version | Sam Rose | 2016-12-31 | 3 | -2/+51 |
| |/ / | |||||
* | | | Merge branch '25964-label-autocomplete-doesn-t-handle-spaces-after' into ↵ | Fatih Acet | 2017-01-03 | 1 | -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-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 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-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 award emoji's See merge request !8398 | ||||
| * | | | | Removed bottom padding from merge manually from CLI because of repositioning ↵additional-award-emoji-repositioning-fixes | dimitrieh | 2017-01-02 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | award emoji's | ||||
* | | | | | 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, e… See merge request !8348 | ||||
| * | | | | | Fixed regression of note-headline-light where it was always placed on 2 ↵regression-note-headline-light | dimitrieh | 2016-12-30 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | lines, even on wide viewports | ||||
* | | | | | | Merge branch 'use-stable-icon-url' into 'master' | Kamil Trzciński | 2017-01-03 | 4 | -2/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use stable icon for Mattermost integration See merge request !8252 | ||||
| * | | | | | | 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 URL See merge request !8321 | ||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy, don't move uploaded avatar files Closes #26158 See merge request !8396 | ||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-path | James Lopez | 2017-01-03 | 21 | -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 Gray | 2017-01-03 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove bottom border from Issuable titles See merge request !8278 | ||||
| * | | | | | | | Remove bottom border from issuable titlesfix-double-line-issuable-page | Alfredo Sumaran | 2016-12-30 | 1 | -0/+6 |
| | | | | | | | | |||||
* | | | | | | | | Minor improvements to changelog docs | Robert Speicher | 2017-01-03 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | Merge branch 'fix-gemfile-lock-update' into 'master' | Yorick Peterse | 2017-01-03 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Gemfile.lock for the octokit update See merge request !8414 | ||||
| * | | | | | | | | Fix Gemfile.lock for the octokit updatefix-gemfile-lock-update | Yorick Peterse | 2017-01-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8158 updated the octokit Gem but did not include all the changes for Gemfile.lock. | ||||
* | | | | | | | | | Merge branch 'minor-ruby-status-badge-changes' into 'master' | Sean McGivern | 2017-01-03 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?) See merge request !8409 | ||||
| * | | | | | | | | | rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?) | dimitrieh | 2017-01-03 | 1 | -3/+3 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'add-tests-to-cycle-analytics' into 'master' 26257-tooltip-hidden-pipeline-dropdown | Sean McGivern | 2017-01-03 | 3 | -3/+129 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests to cycle analytics See merge request !7727 | ||||
| * | | | | | | | | Make haml_lint happyadd-tests-to-cycle-analytics | Alfredo Sumaran | 2017-01-02 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Improve spec | Alfredo Sumaran | 2017-01-02 | 1 | -11/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Add feature tests for Cycle Analytics | Alfredo Sumaran | 2017-01-02 | 3 | -4/+132 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'api-fix-extern-uid-validation' into 'master' | Sean McGivern | 2017-01-03 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: extern_uid is a string Closes #26227 See merge request !8404 | ||||
| * | | | | | | | | API: extern_uid is a stringapi-fix-extern-uid-validation | Robert Schilling | 2017-01-03 | 2 | -3/+3 |
| |/ / / / / / / |