summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-0917-36/+199
|
* 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
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '27610-issue-number-alignment' into 'master'Annabel Dunstone Gray2017-02-096-115/+139
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix alignment for long title Closes #27610 See merge request !9020
| * | | | | | | | | | replaces media query with flexbox27610-issue-number-alignmentNur Rony2017-02-083-62/+66
| | | | | | | | | | |
| * | | | | | | | | | adds changelogNur Rony2017-02-081-0/+4
| | | | | | | | | | |
| * | | | | | | | | | fix alignment for long titleNur Rony2017-02-085-109/+125
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'issue_26701' into 'master'Sean McGivern2017-02-093-11/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove JIRA closed status icon Closes #26701 See merge request !8944
| * | | | | | | | | | | Remove JIRA closed status iconissue_26701Felipe Artur2017-02-083-11/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '23173' into 'master' Rémy Coutable2017-02-092-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced images with the updates UX. Solving #23173 See merge request !8941
| * | | | | | | | | | | #23173 changed profile settings picture to match new UXKartikey Tanna2017-02-092-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #23173 changed Profile Settings > SSH Key (single) picture to match new UX
* | | | | | | | | | | | Merge branch 'patch-13' into 'master' Achilleas Pipinellis2017-02-091-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update git clone docs See merge request !8946
| * | | | | | | | | | | Update note for url-encodedJeJe2017-02-081-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | use note instead of warningJeJe2017-02-031-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Update command-line-commands.md for issue #26428JeJe2017-02-021-0/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs/prometheus' into 'master' Achilleas Pipinellis2017-02-098-104/+273
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Prometheus documentation Closes #27735 See merge request !9060
| * | | | | | | | | | | | Consider existing installations where the setting is not in gitlab.rbAchilleas Pipinellis2017-02-094-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | Change to direct link for Omnibus Nginx docsAchilleas Pipinellis2017-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]