summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix unnecessarily long gl.utils.backOff test36648-fix-backoff-util-testsMike Greiling2017-08-182-29/+31
|
* Merge branch 'docs/docker-entrypoint' into 'master'Marcia Ramos2017-08-171-17/+23
|\ | | | | | | | | Properly explain when advanced Docker options were introduced See merge request !13608
| * Properly explain when advanced Docker options were introduceddocs/docker-entrypointAchilleas Pipinellis2017-08-161-17/+23
| |
* | Merge branch 'docs-article-undo-things-in-git' into 'master'Marcia Ramos2017-08-176-52/+551
|\ \ | | | | | | | | | | | | | | | | | | Docs: article - "Numerous undo possibilities in Git" Closes gitlab-com/community-writers#40 See merge request !13513
| * \ Fix conflictdocs-article-undo-things-in-gitMarcia Ramos2017-08-17650-4524/+9990
| |\ \ | |/ / |/| | | | | | | | | | | Merge branch 'master' into 'docs-article-undo-things-in-git' # Conflicts: # doc/articles/index.md
* | | Merge branch 'docs/importing-refactor' into 'master'Marcia Ramos2017-08-1731-518/+526
|\ \ \ | | | | | | | | | | | | | | | | Move workflow/importing/ to user/project/import/ See merge request !13593
| * | | Move workflow/importing/ to user/project/import/Achilleas Pipinellis2017-08-1731-518/+526
| | |/ | |/|
* | | Merge branch 'winh-collapsed-sidebar-scrolling' into 'master'Phil Hughes2017-08-171-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prevent horizontal scrolling in new sidebar when collapsed Closes #36608 and #36507 See merge request !13638
| * | | Prevent horizontal scrolling in new sidebar when collapsedwinh2017-08-171-0/+4
| | | |
* | | | Merge branch '36087-users-cannot-delete-their-account' into 'master'Rémy Coutable2017-08-173-33/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow all users to delete their account Closes #36087 See merge request !13636
| * | | | Allow all users to delete their accountJacopo2017-08-173-33/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the user could not delete his own account unless signup was enabled in the global settings. This was due to the fact that deleting the user would also delete the issues and other items associated to him. Deleting an user does not destroy essential data anymore, for this reason we removed the `signup_enabled?` check.
* | | | | Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-1712-67/+170
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backports EE mirror stuck handling feature… See merge request !13627
| * | | | | Backports EE mirror stuck handling feature ↵ee-2628-backport-to-ceTiago Botelho2017-08-1712-67/+170
| | | | | | | | | | | | | | | | | | | | | | | | (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE
* | | | | | Merge branch 'grpc-1.4.5' into 'master'Douwe Maan2017-08-173-10/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use grpc 1.4.5 Closes gitaly#468 See merge request !13597
| * | | | | | Use grpc 1.4.5grpc-1.4.5Jacob Vosmaer2017-08-173-10/+23
| | | | | | |
* | | | | | | Merge branch 'fix-height-of-group-share-dropdown' into 'master'Tim Zallmann2017-08-171-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed height of group share dropdown Closes gitlab-ee#3149 See merge request !13505
| * | | | | | Fixed height of group share dropdownPhil Hughes2017-08-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/3149
* | | | | | | Merge branch 'backstage/gb/migrations-tests-schema-version' into 'master'Sean McGivern2017-08-175-28/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve migrations / background migrations testing strategy Closes #36303 See merge request !13589
| * | | | | | | Disable migrations output in migrations helpersGrzegorz Bizon2017-08-171-3/+17
| | | | | | | |
| * | | | | | | Migrate down before each migration unit testbackstage/gb/migrations-tests-schema-versionGrzegorz Bizon2017-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `migrate!` helper triggers a migration that is under the test, so we need to revert it before each subsequent example. This means that we need to place it in `before(:each, :migration)` hook. We still want to migrate everything up *after* each *context*, so in otherwords we need to place migrate up helper in `before(:context, :migration)`.
| * | | | | | | Disable db_cleaner tables caching in migrations testsGrzegorz Bizon2017-08-161-2/+2
| | | | | | | |
| * | | | | | | Extend migrations testing documentationGrzegorz Bizon2017-08-161-2/+8
| | | | | | | |
| * | | | | | | Make it possible to provide schema version in testsGrzegorz Bizon2017-08-163-24/+23
| | | | | | | |
| * | | | | | | Migrate db schema for context in :migration specsGrzegorz Bizon2017-08-162-3/+3
| | | | | | | |
* | | | | | | | Merge branch '35072-fix-pages-delete' into 'master'Sean McGivern2017-08-174-5/+47
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Deleting of a GitLab Pages project results in "`PagesWorker.perform_in` cannot be called inside a transaction"" Closes #35072 See merge request !13631
| * | | | | | | | Run remove_pages in a run_after_commit blockNick Thomas2017-08-173-1/+21
| | | | | | | | |
| * | | | | | | | Remove a wat in NamespacelessProjectDestroyWorkerNick Thomas2017-08-173-4/+26
| | | | | | | | |
* | | | | | | | | Merge branch 'issue_35580' into 'master'Rémy Coutable2017-08-174-24/+139
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project import to group when there are project milestones Closes #35580 See merge request !13482
| * | | | | | | | | Fix project import to group when there are project milestonesFelipe Artur2017-08-174-24/+139
|/ / / / / / / / /
* | | | | | | | | Merge branch 'dev.non-referable-inspect' into 'master'Sean McGivern2017-08-172-9/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | expose Referable#non_referable_inspect See merge request !13613
| * | | | | | | | expose Referable#non_referable_inspectdev.non-referable-inspecthttp://jneen.net/2017-08-162-9/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'zj-fix-fe-posting-value' into 'master'Kamil Trzciński2017-08-174-3/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project templates and add docs Closes #36492 See merge request !13563
| * | | | | | | | Document project templates and link to itZeger-Jan van de Weg2017-08-173-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The link pointed to the wrong page, this is corrected by both writing the documentation and linking to that instead. (internal) Reference: https://gitlab.slack.com/archives/C0NFPSFA8/p1502791719000238
| * | | | | | | | Frontend to send template name instead of on/offZeger-Jan van de Weg2017-08-173-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The params were not getting a value other than `project_templates:"on"` so the backend wasn't sure what template to use. Fixes gitlab-org/gitlab-ce#36492
* | | | | | | | | Merge branch 'fixed-collapsed-sidebar-fly-out-not-showing' into 'master'Tim Zallmann2017-08-171-2/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed collapsed sidebar not showing fly-out menu See merge request !13622
| * | | | | | | | | Fixed collapsed sidebar not showing fly-out menuPhil Hughes2017-08-171-2/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'zj-upgrade-grape' into 'master'Douwe Maan2017-08-178-21/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade grape to 1.0 Closes #36588 See merge request !13609
| * | | | | | | | | Upgrade grape to 1.0Zeger-Jan van de Weg2017-08-168-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main feature was the deprication of the Hashie stuff, so the access by calling keys as method is gone now.
* | | | | | | | | | Merge branch 'help-page-spec-fix' into 'master'Rémy Coutable2017-08-171-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix help page version image spec Closes #36592 See merge request !13605
| * | | | | | | | | | Fix help page version image spechelp-page-spec-fixPhil Hughes2017-08-161-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-milestone-sidebar' into 'master'Phil Hughes2017-08-172-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone sidebar collapse button Closes #36453 See merge request !13620
| * | | | | | | | | | Fix milestone sidebar collapse buttonfix-milestone-sidebarClement Ho2017-08-162-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bvl-docs-add-reserved-names-to-docs' into 'master'Achilleas Pipinellis2017-08-174-6/+122
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reserved names to docs See merge request !13583
| * | | | | | | | | Add reserved names to docsbvl-docs-add-reserved-names-to-docsBob Van Landuyt2017-08-164-6/+122
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-1612-104/+160
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only create commit GPG signature when necessary See merge request !13561
| * | | | | | | | | Only create commit GPG signature when necessarydm-gpg-signature-performanceDouwe Maan2017-08-1612-104/+160
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '36450_second_touch_up' into 'master'Clement Ho2017-08-162-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 'This issue is not confidential' to 'Not confidential' See merge request !13607
| * | | | | | | | | change to 'Not confidential'36450_second_touch_upRegis2017-08-162-2/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'repo-fixes-flex-solution1' into 'master'Jacob Schatz2017-08-162-18/+32
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repo editor with flex layout See merge request !13571
| * | | | | | | | | Repo editor with flex layoutEric Eastwood2017-08-162-18/+32
|/ / / / / / / / /
View Lorry Controller Status