summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove fixed class from file actions25709-diff-file-overflowAnnabel Dunstone Gray2017-01-192-2/+2
* Use flexbox instead of media queriesFilipa Lacerda2017-01-193-74/+36
* Fix haml linter errorsFilipa Lacerda2017-01-191-3/+3
* Adds tooltipsFilipa Lacerda2017-01-192-3/+7
* Responsive title in diffs inline, side by side, with and without sidebarFilipa Lacerda2017-01-193-3/+79
* Merge branch '26601-dropdown-makes-request-close' into 'master' Fatih Acet2017-01-193-15/+21
|\
| * Use bootstrap dropdown events to only make the request when the dropdown is b...26601-dropdown-makes-request-closeFilipa Lacerda2017-01-133-15/+21
* | Merge branch '26472-math-margin' into 'master' Fatih Acet2017-01-192-1/+5
|\ \
| * | Add margin to math blocks26472-math-marginAnnabel Dunstone Gray2017-01-122-1/+5
* | | Merge branch 'use-empty_project-factory-in-api-specs' into 'master' Robert Speicher2017-01-1919-54/+53
|\ \ \
| * | | Replace many :project with :empty_projects in API specsuse-empty_project-factory-in-api-specsRémy Coutable2017-01-1719-54/+53
* | | | Merge branch '26810-fix-undefined-method-revert_group_project_commit_path' in...Robert Speicher2017-01-193-3/+5
|\ \ \ \
| * | | | Ensure group acts as a namespace for polymorphic routes26810-fix-undefined-method-revert_group_project_commit_pathRémy Coutable2017-01-183-3/+5
* | | | | Merge branch 'fix-dashboard-spec' into 'master' Rémy Coutable2017-01-191-1/+1
|\ \ \ \ \
| * | | | | Fix todos specSean McGivern2017-01-191-1/+1
* | | | | | 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
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
View Lorry Controller Status