summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added repo_service_spec for commitFlash and corrected repo_commit-Secion api ↵thenable-ajax-api-callsLuke "Jared" Bennett2017-08-233-8/+60
| | | | spec
* Update repo_commit_section to spy serviceLuke "Jared" Bennett2017-08-231-6/+5
|
* fix failing specs in repo_commit_section_spec.jsMike Greiling2017-08-181-1/+1
|
* fix eslint violations in repo editor filesMike Greiling2017-08-173-10/+12
|
* Add thenable ajax calls.Jacob Schatz2017-08-173-9/+8
|
* 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
|/ / / / / /
* | | | | | Merge branch 'commits-list-page-limit' into 'master'Tim Zallmann2017-08-162-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit list request appending 40 to offset Closes #36569 and #36563 See merge request !13603
| * | | | | Fix commit list request appending 40 to offsetPhil Hughes2017-08-162-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Closes #36569
* | | | | | Merge branch 'charlock-holmes-0.7.5' into 'master'Douwe Maan2017-08-162-3/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Use charlock_holmes 0.7.5 See merge request !13602
| * | | | | Use charlock_holmes 0.7.5Jacob Vosmaer2017-08-162-3/+3
| | | | | |
* | | | | | Merge branch 'docs/database-development' into 'master'Rémy Coutable2017-08-167-1/+220
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more database development related docs See merge request !13466
| * | | | | | Document not using database hash indexesYorick Peterse2017-08-162-0/+21
| | | | | | |