summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'didemacet-markdown-area-height-fix' into 'master' 26874-avatar-misalign-builds-pageFatih Acet2017-01-193-0/+42
|\
| * Autoresize markdown previewdidemacet-markdown-area-height-fixClement Ho2017-01-173-0/+42
* | Merge branch 'feature/gitaly-feature-flag' into 'master' Robert Speicher2017-01-194-1/+41
|\ \
| * | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flagAhmad Sherif2017-01-184-1/+41
* | | Merge branch 'button-alignment' into 'master' Fatih Acet2017-01-192-2/+1
|\ \ \
| * | | Fix small button alignment issuesbutton-alignmentAnnabel Dunstone Gray2017-01-182-2/+1
* | | | Merge branch 'allow-shared-examples-jasmine' into 'master' Fatih Acet2017-01-194-2/+48
|\ \ \ \
| * | | | Add first shared examples to a helper and updated teaspoon_env to allow helpe...allow-shared-examples-jasmineLuke "Jared" Bennett2017-01-184-2/+48
* | | | | Merge branch 'brakeman-upgrade' into 'master' Robert Speicher2017-01-192-3/+3
|\ \ \ \ \
| * | | | | Upgrade Brakeman to 3.4.1brakeman-upgradeBrian Neel2017-01-182-3/+3
* | | | | | Merge branch 'simple-eslint-fixes' into 'master' Fatih Acet2017-01-19193-1209/+943
|\ \ \ \ \ \
| * | | | | | resolve all space-in-parens eslint violationssimple-eslint-fixesMike Greiling2017-01-184-14/+14
| * | | | | | resolve all prefer-const eslint violationsMike Greiling2017-01-1815-47/+44
| * | | | | | resolve all no-dupe-keys eslint violationsMike Greiling2017-01-182-4/+2
| * | | | | | resolve all parseInt radix eslint violationsMike Greiling2017-01-188-17/+17
| * | | | | | resolve all x-spacing and no-spaced-x eslint violationsMike Greiling2017-01-1842-178/+184
| * | | | | | resolve all indent eslint violationsMike Greiling2017-01-1821-326/+331
| * | | | | | resolve all no-trailing-spaces eslint violationsMike Greiling2017-01-182-2/+2
| * | | | | | resolve all no-irregular-whitespace eslint violationsMike Greiling2017-01-184-9/+9
| * | | | | | resolve all padded-blocks eslint violationsMike Greiling2017-01-18160-434/+162
| * | | | | | resolve all semi and no-extra-semi eslint violationsMike Greiling2017-01-1843-285/+285
| * | | | | | resolve all no-plusplus eslint violationsMike Greiling2017-01-1827-96/+96
* | | | | | | Merge branch 'wip-mr-from-commits' into 'master' Sean McGivern2017-01-1912-3/+222
|\ \ \ \ \ \ \
| * | | | | | | Show a custom WIP help message for MR's with WIP commitsjurre2017-01-194-2/+70
| * | | | | | | Mark MR as WIP when pushing WIP commitsjurre2017-01-198-1/+152
* | | | | | | | Merge branch 'rs-revert-sassc' into 'master' Robert Speicher2017-01-193-17/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Merge branch 'switch-to-sassc' into 'master' "Robert Speicher2017-01-193-17/+8
|/ / / / / / / /
* | | | | | | | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-1918-3/+530
|\ \ \ \ \ \ \ \
| * | | | | | | | More improvements to presenters23563-document-presentersRémy Coutable2017-01-1816-127/+102
| * | | | | | | | Fix typos and improve presenters documentationRémy Coutable2017-01-181-39/+28
| * | | | | | | | Add Presentable concernRémy Coutable2017-01-185-3/+28
| * | | | | | | | Improve presenter factoryRémy Coutable2017-01-184-87/+64
| * | | | | | | | Improve presenter architectureRémy Coutable2017-01-1816-139/+288
| * | | | | | | | Handle presenters in BasePolicyRémy Coutable2017-01-182-0/+21
| * | | | | | | | Document presentersRémy Coutable2017-01-189-0/+391
* | | | | | | | | Merge branch 'patch-9' into 'master' Fatih Acet2017-01-191-10/+68
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix markdown errors.patch-9Bryce Johnson2016-12-211-2/+2
| * | | | | | | | | Add documentation for possible causes of JS-related test failures.Bryce Johnson2016-12-211-10/+68
* | | | | | | | | | Merge branch 'milestone-issuable-row-numbers' into 'master' Fatih Acet2017-01-192-3/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replaced `.pull-right` with `.right`milestone-issuable-row-numbersPhil Hughes2017-01-181-1/+2
| * | | | | | | | | | Fixed some HAML errors on milestone#showPhil Hughes2017-01-132-3/+1
* | | | | | | | | | | Merge branch '26803-typing-then-tab-in-a-comment-doesn-t-select-the-author' i...Fatih Acet2017-01-193-1/+106
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed highlightFirst and added specs26803-typing-then-tab-in-a-comment-doesn-t-select-the-authorLuke "Jared" Bennett2017-01-183-1/+106
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'input-button-hover' into 'master' Fatih Acet2017-01-192-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add hover state to MR comment reply buttoninput-button-hoverAnnabel Dunstone Gray2017-01-122-1/+5
* | | | | | | | | | | | Merge branch '24032-changed-visibility-level-to-public-but-project-is-not-pub...Fatih Acet2017-01-1910-70/+276
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed tests24032-changed-visibility-level-to-public-but-project-is-not-publicLuke "Jared" Bennett2016-12-1011-33/+151
| * | | | | | | | | | | | Align permissions optionsAnnabel Dunstone Gray2016-12-103-56/+49
| * | | | | | | | | | | | Created shared/visibility_select and merged with feature permissions uiLuke "Jared" Bennett2016-12-107-59/+154
* | | | | | | | | | | | | Merge branch 'document-auto_link_ldap_user' into 'master' Achilleas Pipinellis2017-01-191-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \