summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make min width smaller for user settingsuser-dropdown-settingsAnnabel Dunstone Gray2017-02-091-1/+1
|
* Merge branch 'revert-0ef587b6' into 'master' Filipa Lacerda2017-02-0925-41/+94
|\ | | | | | | | | | | | | Responsive title in diffs inline, side by side, with and without sidebar Closes #25709 See merge request !8707
| * Fix expand_collapse_diffs specsrevert-0ef587b6Annabel Dunstone Gray2017-02-091-6/+6
| |
| * Reduce file header paddingAnnabel Dunstone Gray2017-02-081-3/+2
| |
| * Align file header items while keeping collapse functionalityAnnabel Dunstone Gray2017-02-083-4/+16
| |
| * Use a new class to keep old behaviorFilipa Lacerda2017-02-0821-36/+36
| |
| * Revert "Merge branch 'revert-a91ff32b' into 'master'"Filipa Lacerda2017-02-085-4/+46
| | | | | | This reverts merge request !8688
* | Merge branch '27943-contribution-list-on-profile-page-is-aligned-right' into ↵Annabel Dunstone Gray2017-02-092-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix contribution activity alignment Closes #27943 See merge request !9101
| * | Fix contribution activity alignment27943-contribution-list-on-profile-page-is-aligned-rightClement Ho2017-02-092-0/+6
| | |
* | | Merge branch 'rs-gemfetcher-cop-spec' into 'master'Sean McGivern2017-02-094-19/+76
|\ \ \ | | | | | | | | | | | | | | | | Add a spec for our custom GemFetcher cop See merge request !9076
| * | | Add a spec for our custom GemFetcher coprs-gemfetcher-cop-specRobert Speicher2017-02-094-19/+76
| |/ /
* | | Merge branch 'upgrade-webpack-v2.2' into 'master' Alfredo Sumaran2017-02-094-20/+35
|\ \ \ | | | | | | | | | | | | | | | | Upgrade to webpack v2.2.1 See merge request !9078
| * | | add CHANGELOG.md entry for !9078upgrade-webpack-v2.2Mike Greiling2017-02-091-0/+4
| | | |
| * | | approve new dependenciesMike Greiling2017-02-091-0/+12
| | | |
| * | | update karma deps to work with webpack 2Mike Greiling2017-02-091-2/+2
| | | |
| * | | upgrade to webpack 2.2.xMike Greiling2017-02-092-18/+17
| | | |
* | | | Merge branch '27726-fix-dropdown-width-in-admin-project-page' into 'master' Filipa Lacerda2017-02-092-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes dropdown width in admin project page Closes #27726 See merge request !9002
| * | | | adds max-width only for new filter dropdown27726-fix-dropdown-width-in-admin-project-pageNur Rony2017-02-091-1/+1
| | | | |
| * | | | adds changelogNur Rony2017-02-091-0/+4
| | | | |
| * | | | fixes dropdown width in admin project pageNur Rony2017-02-091-1/+4
| | | | |
* | | | | Merge branch 'build-notification-null' into 'master' Filipa Lacerda2017-02-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a null check to build notifications Closes #27948 See merge request !9108
| * | | | | Adds a null check to build notificationsPhil Hughes2017-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Closes #27948
* | | | | | Merge branch 'update-rspec_profiling' into 'master' Rémy Coutable2017-02-092-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the rspec_profiling gem to 0.0.5 Closes #27517 See merge request !9094
| * | | | | | Update the rspec_profiling gem to 0.0.5update-rspec_profilingRémy Coutable2017-02-092-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'upgrade-babel-v6' into 'master' Alfredo Sumaran2017-02-096-10/+19
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Upgrade from Babel 5 to Babel 6 See merge request !9072
| * | | | | | add CHANGELOG.md entry for !9072Mike Greiling2017-02-091-0/+4
| | | | | | |
| * | | | | | approve MIT license for wordwrap submoduleMike Greiling2017-02-091-0/+6
| | | | | | |
| * | | | | | fix failing karma testMike Greiling2017-02-092-3/+3
| | | | | | |
| * | | | | | upgrade babel to v6Mike Greiling2017-02-092-7/+5
| | | | | | |
| * | | | | | exclude node_modules from imports-loader wrapperMike Greiling2017-02-091-0/+1
| | | | | | |
* | | | | | | Merge branch 'patch-9' into 'master' Rémy Coutable2017-02-091-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oauth2.md: should use the provider's URL which is gitlab.example.com See merge request !8173
| * | | | | | | oauth2.md: should use the provider's URL which is gitlab.example.comMehdy Khoshnoody2016-12-191-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'move-user-snippets-spinach-test-to-rspec' into 'master'Rémy Coutable2017-02-093-89/+49
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Move 'User Snippets' Spinach feature to Rspec See merge request !8574
| * | | | | | | Move 'User Snippets' Spinach feature to Rspecthe-undefined2017-01-163-89/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves the `snippets/user.feature` Spinach test to a Rspec feature, as part of deprecating the Spinach test suite. - Remove Spinach discover snippets feature and steps - Add Rspec feature test
* | | | | | | | Merge branch 'make-it-2017' into 'master' Rémy Coutable2017-02-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update LICENSE to 2017 See merge request !9079
| * | | | | | | | Update LICENSE to 2017make-it-2017💃 Winnie 💃2017-02-081-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'diff-notes-refactor' into 'master' Filipa Lacerda2017-02-0911-67/+52
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Refactored diff notes Vue app See merge request !9065
| * | | | | | | | Uses shared vue resource interceptorPhil Hughes2017-02-091-7/+1
| | | | | | | | |
| * | | | | | | | Refactored diff notes Vue appPhil Hughes2017-02-0911-67/+58
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | It now relies on its Vue bundle rather than the window. Fixes some reactivity issues that was happening in EE
* | | | | | | | Merge branch '27718-improve-bug-template' into 'master' Sean Packham2017-02-091-12/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to disambiguate the Bug issue template Closes #27718 See merge request !9064
| * | | | | | | | Try to disambiguate the Bug issue template27718-improve-bug-templateRémy Coutable2017-02-081-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'zj-drop-ruby-2-1' into 'master' Sean McGivern2017-02-091-57/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop support for Ruby 2.1 Closes #27251 See merge request !9098
| * | | | | | | | | Drop support for Ruby 2.1zj-drop-ruby-2-1Z.J. van de Weg2017-02-061-57/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given that the 9.0 release of GitLab will mark the end of the support for Ruby 2.1, we can stop testing against Ruby 2.1. Fixes #27251
* | | | | | | | | | Merge branch 'adam-contributing-fix-link' into 'master' Rémy Coutable2017-02-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix menu link in CONTRIBUTING See merge request !9084
| * | | | | | | | | | Fix menu link in CONTRIBUTINGadam-contributing-fix-linkAdam Niedzielski2017-02-091-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fixes/namespace-api-documentation' into 'master'Rémy Coutable2017-02-093-81/+18
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update API docs for new namespace format Closes #27730 See merge request !9073
| * | | | | | | | | | Update API docs for new namespace formatMarkus Koller2017-02-083-81/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up to d05dd81b which changed the nested namespaces in projects to use API::Entities::Namespace instead of exposing all fields. Fixes #27730
* | | | | | | | | | | Merge branch 'dm-copy-as-gfm-anchor-link' into 'master' Douwe Maan2017-02-092-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly transform an anchor link to GFM when copying it See merge request !9080
| * | | | | | | | | | | Remove changelogdm-copy-as-gfm-anchor-linkDouwe Maan2017-02-091-4/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Correctly transform an anchor link to GFM when copying itDouwe Maan2017-02-093-0/+9
| | | | | | | | | | | |