summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | |
* | | | | | | | Minor improvements to changelog docsRobert Speicher2017-01-031-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'fix-gemfile-lock-update' into 'master' Yorick Peterse2017-01-031-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Gemfile.lock for the octokit update See merge request !8414
| * | | | | | | | Fix Gemfile.lock for the octokit updatefix-gemfile-lock-updateYorick Peterse2017-01-031-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 McGivern2017-01-031-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?)dimitrieh2017-01-031-3/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'add-tests-to-cycle-analytics' into 'master' 26257-tooltip-hidden-pipeline-dropdownSean McGivern2017-01-033-3/+129
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add tests to cycle analytics See merge request !7727
| * | | | | | | | Make haml_lint happyadd-tests-to-cycle-analyticsAlfredo Sumaran2017-01-021-1/+1
| | | | | | | | |
| * | | | | | | | Improve specAlfredo Sumaran2017-01-021-11/+9
| | | | | | | | |
| * | | | | | | | Add feature tests for Cycle AnalyticsAlfredo Sumaran2017-01-023-4/+132
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'api-fix-extern-uid-validation' into 'master' Sean McGivern2017-01-032-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: extern_uid is a string Closes #26227 See merge request !8404
| * | | | | | | | API: extern_uid is a stringapi-fix-extern-uid-validationRobert Schilling2017-01-032-3/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'octokit' into 'master' Sean McGivern2017-01-032-4/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update octokit to 4.6.2 See merge request !8158
| * | | | | | | Update octokit to 4.6.2Manuel Rüger2016-12-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChangeLog: https://github.com/octokit/octokit.rb/releases
* | | | | | | | Merge branch '26218-rety-button-pipeline-builds-name-drodown-broken' into ↵25564-uniquely-and-uniformly-style-status-badgesFatih Acet2017-01-022-2/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu Closes #26218 See merge request !8399
| * | | | | | | Increases pipeline graph drowdown width in order to prevent strange position ↵Filipa Lacerda2017-01-022-2/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on chrome on ubuntu Adds MR ID to changelog entry
* | | | | | | Merge branch 'remove-timezone-assertion-datetime-on-tooltips-spec' into ↵Alfredo Sumaran2017-01-021-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove time zone information from assertion in timeago tooltips spec Closes #26183 See merge request !8374
| * | | | | | Remove time zone information from assertion in timeago tooltips specremove-timezone-assertion-datetime-on-tooltips-specAdam Niedzielski2016-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the test to pass when your local time zone is different than UTC. "Date Format" JavaScript library uses a custom, non-standard format when displaying time zone part of the datetime. There is no point in trying to replicate this behavior in Ruby.
* | | | | | | Merge branch '22072-enable-haml-lints' into 'master' Alfredo Sumaran2016-12-31217-645/+634
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable HAML-LINT linters Closes #22072 See merge request !8247
| * | | | | | HAMLLint: Fix `ImplicitDiv` offence post-rebase22072-enable-haml-lintsKushal Pandya2016-12-311-1/+1
| | | | | | |
View Lorry Controller Status