Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added repo_service_spec for commitFlash and corrected repo_commit-Secion api ↵thenable-ajax-api-calls | Luke "Jared" Bennett | 2017-08-23 | 3 | -8/+60 |
| | | | | spec | ||||
* | Update repo_commit_section to spy service | Luke "Jared" Bennett | 2017-08-23 | 1 | -6/+5 |
| | |||||
* | fix failing specs in repo_commit_section_spec.js | Mike Greiling | 2017-08-18 | 1 | -1/+1 |
| | |||||
* | fix eslint violations in repo editor files | Mike Greiling | 2017-08-17 | 3 | -10/+12 |
| | |||||
* | Add thenable ajax calls. | Jacob Schatz | 2017-08-17 | 3 | -9/+8 |
| | |||||
* | Merge branch 'ee-2628-backport-to-ce' into 'master' | Douwe Maan | 2017-08-17 | 12 | -67/+170 |
|\ | | | | | | | | | Backports EE mirror stuck handling feature… See merge request !13627 | ||||
| * | Backports EE mirror stuck handling feature ↵ee-2628-backport-to-ce | Tiago Botelho | 2017-08-17 | 12 | -67/+170 |
| | | | | | | | | (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE | ||||
* | | Merge branch 'grpc-1.4.5' into 'master' | Douwe Maan | 2017-08-17 | 3 | -10/+23 |
|\ \ | | | | | | | | | | | | | | | | | | | Use grpc 1.4.5 Closes gitaly#468 See merge request !13597 | ||||
| * | | Use grpc 1.4.5grpc-1.4.5 | Jacob Vosmaer | 2017-08-17 | 3 | -10/+23 |
| | | | |||||
* | | | Merge branch 'fix-height-of-group-share-dropdown' into 'master' | Tim Zallmann | 2017-08-17 | 1 | -2/+1 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Fixed height of group share dropdown Closes gitlab-ee#3149 See merge request !13505 | ||||
| * | | Fixed height of group share dropdown | Phil Hughes | 2017-08-17 | 1 | -2/+1 |
| | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/3149 | ||||
* | | | Merge branch 'backstage/gb/migrations-tests-schema-version' into 'master' | Sean McGivern | 2017-08-17 | 5 | -28/+47 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improve migrations / background migrations testing strategy Closes #36303 See merge request !13589 | ||||
| * | | | Disable migrations output in migrations helpers | Grzegorz Bizon | 2017-08-17 | 1 | -3/+17 |
| | | | | |||||
| * | | | Migrate down before each migration unit testbackstage/gb/migrations-tests-schema-version | Grzegorz Bizon | 2017-08-17 | 1 | -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 tests | Grzegorz Bizon | 2017-08-16 | 1 | -2/+2 |
| | | | | |||||
| * | | | Extend migrations testing documentation | Grzegorz Bizon | 2017-08-16 | 1 | -2/+8 |
| | | | | |||||
| * | | | Make it possible to provide schema version in tests | Grzegorz Bizon | 2017-08-16 | 3 | -24/+23 |
| | | | | |||||
| * | | | Migrate db schema for context in :migration specs | Grzegorz Bizon | 2017-08-16 | 2 | -3/+3 |
| | | | | |||||
* | | | | Merge branch '35072-fix-pages-delete' into 'master' | Sean McGivern | 2017-08-17 | 4 | -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 block | Nick Thomas | 2017-08-17 | 3 | -1/+21 |
| | | | | | |||||
| * | | | | Remove a wat in NamespacelessProjectDestroyWorker | Nick Thomas | 2017-08-17 | 3 | -4/+26 |
| | | | | | |||||
* | | | | | Merge branch 'issue_35580' into 'master' | Rémy Coutable | 2017-08-17 | 4 | -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 milestones | Felipe Artur | 2017-08-17 | 4 | -24/+139 |
|/ / / / / | |||||
* | | | | | Merge branch 'dev.non-referable-inspect' into 'master' | Sean McGivern | 2017-08-17 | 2 | -9/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | expose Referable#non_referable_inspect See merge request !13613 | ||||
| * | | | | expose Referable#non_referable_inspectdev.non-referable-inspect | http://jneen.net/ | 2017-08-16 | 2 | -9/+5 |
| | | | | | |||||
* | | | | | Merge branch 'zj-fix-fe-posting-value' into 'master' | Kamil Trzciński | 2017-08-17 | 4 | -3/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project templates and add docs Closes #36492 See merge request !13563 | ||||
| * | | | | | Document project templates and link to it | Zeger-Jan van de Weg | 2017-08-17 | 3 | -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/off | Zeger-Jan van de Weg | 2017-08-17 | 3 | -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 Zallmann | 2017-08-17 | 1 | -2/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed collapsed sidebar not showing fly-out menu See merge request !13622 | ||||
| * | | | | | | Fixed collapsed sidebar not showing fly-out menu | Phil Hughes | 2017-08-17 | 1 | -2/+5 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'zj-upgrade-grape' into 'master' | Douwe Maan | 2017-08-17 | 8 | -21/+23 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade grape to 1.0 Closes #36588 See merge request !13609 | ||||
| * | | | | | | Upgrade grape to 1.0 | Zeger-Jan van de Weg | 2017-08-16 | 8 | -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 Coutable | 2017-08-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix help page version image spec Closes #36592 See merge request !13605 | ||||
| * | | | | | | | Fix help page version image spechelp-page-spec-fix | Phil Hughes | 2017-08-16 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'fix-milestone-sidebar' into 'master' | Phil Hughes | 2017-08-17 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone sidebar collapse button Closes #36453 See merge request !13620 | ||||
| * | | | | | | | Fix milestone sidebar collapse buttonfix-milestone-sidebar | Clement Ho | 2017-08-16 | 2 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'bvl-docs-add-reserved-names-to-docs' into 'master' | Achilleas Pipinellis | 2017-08-17 | 4 | -6/+122 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | Add reserved names to docs See merge request !13583 | ||||
| * | | | | | | Add reserved names to docsbvl-docs-add-reserved-names-to-docs | Bob Van Landuyt | 2017-08-16 | 4 | -6/+122 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'dm-gpg-signature-performance' into 'master' | Robert Speicher | 2017-08-16 | 12 | -104/+160 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only create commit GPG signature when necessary See merge request !13561 | ||||
| * | | | | | | Only create commit GPG signature when necessarydm-gpg-signature-performance | Douwe Maan | 2017-08-16 | 12 | -104/+160 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch '36450_second_touch_up' into 'master' | Clement Ho | 2017-08-16 | 2 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 'This issue is not confidential' to 'Not confidential' See merge request !13607 | ||||
| * | | | | | | change to 'Not confidential'36450_second_touch_up | Regis | 2017-08-16 | 2 | -2/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'repo-fixes-flex-solution1' into 'master' | Jacob Schatz | 2017-08-16 | 2 | -18/+32 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repo editor with flex layout See merge request !13571 | ||||
| * | | | | | | Repo editor with flex layout | Eric Eastwood | 2017-08-16 | 2 | -18/+32 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'commits-list-page-limit' into 'master' | Tim Zallmann | 2017-08-16 | 2 | -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 offset | Phil Hughes | 2017-08-16 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #36569 | ||||
* | | | | | | Merge branch 'charlock-holmes-0.7.5' into 'master' | Douwe Maan | 2017-08-16 | 2 | -3/+3 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Use charlock_holmes 0.7.5 See merge request !13602 | ||||
| * | | | | | Use charlock_holmes 0.7.5 | Jacob Vosmaer | 2017-08-16 | 2 | -3/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'docs/database-development' into 'master' | Rémy Coutable | 2017-08-16 | 7 | -1/+220 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more database development related docs See merge request !13466 | ||||
| * | | | | | | Document not using database hash indexes | Yorick Peterse | 2017-08-16 | 2 | -0/+21 |
| | | | | | | |