summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove JSX/React eslint plugins.remove-jsx-react-eslint-pluginsLuke "Jared" Bennett2016-11-2912-36/+39
* Merge branch 'fix/blob-controller-spec' into 'master' Sean McGivern2016-11-291-1/+1
|\
| * fix blob controller spec failure - updated not to use file-path-fix/blob-controller-specJames Lopez2016-11-292-2/+2
| * fix blob controller spec failureJames Lopez2016-11-291-1/+1
* | Merge branch 'docs/fix-bitbucket-integration-typos' into 'master' Achilleas Pipinellis2016-11-291-2/+2
|\ \
| * | Fixing typo & Clarifying Key nameLee Matos2016-11-291-2/+2
* | | Merge branch '24880-configurable-plaintext-emails' into 'master' Sean McGivern2016-11-298-2/+94
|\ \ \
| * | | Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-288-2/+94
* | | | Merge branch 'zj-issue-search-slash-command' into 'master' Kamil Trzciński2016-11-297-9/+71
|\ \ \ \
| * | | | Add issue search slash commandzj-issue-search-slash-commandZ.J. van de Weg2016-11-257-9/+71
* | | | | Merge branch '24150-consistent-dropdown-styles' into 'master' Annabel Dunstone Gray2016-11-2916-60/+91
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | dropdowns.scss: Fix style issues after reviewDavid Wagner2016-11-281-5/+0
| * | | | Update some more sort/filter dropdownsDavid Wagner2016-11-288-17/+17
| * | | | Update the ChangelogDavid Wagner2016-11-281-0/+4
| * | | | Make open and hovered dropdown toggles look the sameDavid Wagner2016-11-281-8/+11
| * | | | Homogenize dropdowns on Issue pageDavid Wagner2016-11-287-43/+72
* | | | | Merge branch 'hide-project-variables' into 'master' Fatih Acet2016-11-296-2/+82
|\ \ \ \ \
| * | | | | Enable ESLint and fix minor code style stuff in project_variables.js.es6.hide-project-variablesFatih Acet2016-11-291-21/+20
| * | | | | Add spec for hiding variables and remove the need for ES6 SymbolStan Hu2016-11-242-3/+28
| * | | | | Hide project variables values by defaultStan Hu2016-11-245-2/+58
* | | | | | Merge branch 'refactor-issuable-description-and-metadata' into 'master' Robert Speicher2016-11-294-74/+138
|\ \ \ \ \ \
| * | | | | | Refactor issuable description and metadata form sectionsrefactor-issuable-description-and-metadataRémy Coutable2016-11-254-74/+138
* | | | | | | Merge branch 'hoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emails' i...Douwe Maan2016-11-2916-35/+154
|\ \ \ \ \ \ \
| * | | | | | | Use assigned variables betterhoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emailsSean McGivern2016-11-283-6/+4
| * | | | | | | Fix spec styleSean McGivern2016-11-282-10/+5
| * | | | | | | Don't use diff_line_content for emailsSean McGivern2016-11-282-4/+2
| * | | | | | | Don't remove + / - signs from diff emailsSean McGivern2016-11-282-2/+4
| * | | | | | | Tidy up text emailsSean McGivern2016-11-286-14/+13
| * | | | | | | Fix CHANGELOGSean McGivern2016-11-252-1/+4
| * | | | | | | Clean up rubocop complainthhoopes2016-11-251-1/+1
| * | | | | | | Add keyword arguments to truncated_diff methodhhoopes2016-11-2513-55/+38
| * | | | | | | Change diff highlight/truncate for reusabilityhhoopes2016-11-2511-22/+139
| * | | | | | | Add new template to handle both commit & mr noteshhoopes2016-11-257-40/+40
| * | | | | | | Add diff hunks to notification emails on MRhhoopes2016-11-255-3/+27
* | | | | | | | Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' Douwe Maan2016-11-2814-33/+97
* | | | | | | | Merge branch 'jej-fix-missing-access-check-on-issues' into 'security'Douwe Maan2016-11-2817-23/+62
* | | | | | | | Merge branch 'jej-22869' into 'security'Douwe Maan2016-11-286-14/+108
* | | | | | | | Merge branch 'zj-fix-label-creation-non-members' into 'security'Douwe Maan2016-11-289-82/+78
* | | | | | | | Merge branch 'ldap_user_filter_update2' into 'master' [ci skip] Drew Blessing2016-11-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove `memberOf` OID in LDAP `user_filter` docs ldap_user_filter_update2Drew Blessing2016-11-281-1/+1
* | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqAlejandro Rodríguez2016-11-2814-52/+29
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update CHANGELOG.md for 8.13.7Rémy Coutable2016-11-281-0/+9
| * | | | | | | | Update CHANGELOG.md for 8.14.1Alejandro Rodríguez2016-11-2814-52/+20
* | | | | | | | | Merge branch 'update-button-style' into 'master' ldap_user_filter_updateAnnabel Dunstone Gray2016-11-282-43/+53
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Add darker active state for outline buttons and new border colors.Chris Peressini2016-11-282-10/+16
| * | | | | | | | Create secondary colors with darken functionChris Peressini2016-11-281-34/+38
| |/ / / / / / /
* | | | | | | | Merge branch '24149-nav-hover' into 'master' Annabel Dunstone Gray2016-11-281-33/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Add hover state to navigation rows24149-nav-hovertauriedavis2016-11-281-33/+18
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '24985-environments-spinner' into 'master' Fatih Acet2016-11-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds spinner class24985-environments-spinnerFilipa Lacerda2016-11-251-1/+1