summaryrefslogtreecommitdiff
Commit message (Collapse)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
| | | | Move CSS to correct file
* 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
| | | | Adds MR ID to CHANGELOG entry
* Merge branch '26601-dropdown-makes-request-close' into 'master' Fatih Acet2017-01-193-15/+21
|\ | | | | | | | | | | | | Fixes builds dropdown making request when clicked to be closed Closes #26601 See merge request !8545
| * Use bootstrap dropdown events to only make the request when the dropdown is ↵26601-dropdown-makes-request-closeFilipa Lacerda2017-01-133-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | being opened Fixes builds dropdown making request when clicked to be closed Adds MR ID to CHANGELOG Improve documentation Use bootstrap dropdown events to only make the request when the dropdown is being opened
* | Merge branch '26472-math-margin' into 'master' Fatih Acet2017-01-192-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Add margin to math blocks Closes #26472 See merge request !8543
| * | 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 specs See merge request !8608
| * | | Replace many :project with :empty_projects in API specsuse-empty_project-factory-in-api-specsRémy Coutable2017-01-1719-54/+53
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '26810-fix-undefined-method-revert_group_project_commit_path' ↵Robert Speicher2017-01-193-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Ensure group acts as a namespace for polymorphic routes Closes #26810 See merge request !8627
| * | | | Ensure group acts as a namespace for polymorphic routes26810-fix-undefined-method-revert_group_project_commit_pathRémy Coutable2017-01-183-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'fix-dashboard-spec' into 'master' Rémy Coutable2017-01-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix todos spec See merge request !8643
| * | | | | Fix todos specSean McGivern2017-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was changed in a community MR, but the branch was far enough behind master that it didn't have this spec.
* | | | | | Merge branch 'didemacet-markdown-area-height-fix' into 'master' 26874-avatar-misalign-builds-pageFatih Acet2017-01-193-0/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autoresize markdown preview Closes #24372 See merge request !8607
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly feature flag See merge request !8440
| * | | | | | 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 issues See merge request !8631
| * | | | | | | 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 jasmine helpers and run their specs Closes #26305 See merge request !8437
| * | | | | | | | Add first shared examples to a helper and updated teaspoon_env to allow ↵allow-shared-examples-jasmineLuke "Jared" Bennett2017-01-184-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | helper specs to run
* | | | | | | | | Merge branch 'brakeman-upgrade' into 'master' Robert Speicher2017-01-192-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Brakeman to 3.4.1 Closes #26820 See merge request !8629
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple eslint fixes See merge request !8536
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark MR as WIP when pushing WIP commits Closes #25036 See merge request !8124
| * | | | | | | | | | | 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'" Closes #26762 See merge request !8642
| * | | | | | | | | | | Revert "Merge branch 'switch-to-sassc' into 'master' "Robert Speicher2017-01-193-17/+8
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1, reversing changes made to 78d710388fbabe27481c77cc353610904465c4df. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26762
* | | | | | | | | | | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-1918-3/+530
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document presenters Closes #23563 See merge request !8480
| * | | | | | | | | | | More improvements to presenters23563-document-presentersRémy Coutable2017-01-1816-127/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Fix typos and improve presenters documentationRémy Coutable2017-01-181-39/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Add Presentable concernRémy Coutable2017-01-185-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Improve presenter factoryRémy Coutable2017-01-184-87/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Improve presenter architectureRémy Coutable2017-01-1816-139/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Handle presenters in BasePolicyRémy Coutable2017-01-182-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Document presentersRémy Coutable2017-01-189-0/+391
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>