summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add IoC container which is CI config entry locatorrefactor/ci-config-logical-validationGrzegorz Bizon2016-07-222-0/+68
|
* Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-22233-2300/+3694
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (183 commits) Add a spec for #20079. Skip repository storage path valitaions on test environment Use Pathname to make the repository storage path validations more robust Update to gitlab_git 10.4.1 and take advantage of preserved Ref objects Change nav link snippet controller Reduce min width of pipeline table Retrieve rendered HTML from cache in one request Explain CI_PROJECT_NAMESPACE better Bump vmstat version to fix issues reporting on FreeBSD Fix sha icon positioning on safari Don't drop in DropAndReaddHasExternalWikiInProjects Mobile view for commit status Fix ci icons getting cut off Update CHANGELOG Extract helper methods to clean up RepositoryArchiveCleanUpService spec Use Dir.mktmpdir instead of FileUtils.mkdir_p in the spec Fix firefox rendering of SVGs Fix icons on commits page and builds page Add new fork SVG to fix weird styling of other SVGs Bug fixes ...
| * Merge branch 'namespace' into 'master' Achilleas Pipinellis2016-07-221-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain CI_PROJECT_NAMESPACE better ## What does this MR do? Explain CI_PROJECT_NAMESPACE better by adding "The project namespace (username or groupname) that is currently being built". ## Are there points in the code the reviewer needs to double check? Are `username` and `groupname` known words? We use it [here](http://docs.gitlab.com/ee/api/namespaces.html). ## Why was this MR needed? Because `namespace` isn't a well known term. ## What are the relevant issue numbers? ## Screenshots (if relevant) See merge request !5407
| | * Explain CI_PROJECT_NAMESPACE betternamespaceMark Pundsack2016-07-211-1/+1
| | |
| * | Merge branch '20079-new-wiki-page-500-spec' into 'master' Stan Hu2016-07-222-0/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a spec for #20079 - This MR adds a spec for the fix for #20079 that was implemented in !5400. - The spec is going in separately, just so the fix could go in as soon as possible. See merge request !5414
| | * | Add a spec for #20079.Timothy Andrew2016-07-222-0/+16
| |/ / | | | | | | | | | | | | The issue was fixed in 2ba5e62. The spec is going in separately just so the fix could go in as soon as possible.
| * | Merge branch ↵Stan Hu2016-07-212-18/+40
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19572-storage-path-validations-fail-incorrectly-for-some-patterns' into 'master' Fix a false positive where similar un-nested storage paths were reported as nested Closes #19572 See merge request !5145
| | * | Skip repository storage path valitaions on test environmentAlejandro Rodríguez2016-07-212-14/+15
| | | | | | | | | | | | | | | | | | | | Storage path are not created until `TestEnv.init`, so we must skip their validation on initialization.
| | * | Use Pathname to make the repository storage path validations more robustAlejandro Rodríguez2016-07-212-8/+29
| | | |
| * | | Merge branch ↵Yorick Peterse2016-07-219-39/+29
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-seconds' into 'master' Improve performance of tags controller See merge request !5375
| | * | | Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez2016-07-219-39/+29
| | |/ /
| * | | Merge branch '20046-snippets-menu' into 'master' Robert Speicher2016-07-211-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change nav link snippet controller Removes active Snippets nav link state for project-specific snippets Closes #20046 See merge request !5410
| | * | Change nav link snippet controllerAnnabel Dunstone2016-07-211-1/+1
| | | |
| * | | Merge branch 'fix-data-integrity-issue-with-repository-downloads-path' into ↵Douwe Maan2016-07-218-38/+133
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Avoid data-integrity issue when cleaning up repository archive cache ## What does this MR do? Sets the default value for `repository_downloads_path` if someone has it configured incorrectly, and it points to the path where repositories are stored. It's also replace invocation of `find` with Ruby code that matches old cached files in a better, and safe way to avoid data-integrity issues. ## Why was this MR needed? The `repository_downloads_path` is used by the `RepositoryArchiveCacheWorker` to remove outdated repository archives, if it points to the wrong directory can cause some data-integrity issue. ## What are the relevant issue numbers? Closes #14222 See merge request !5285
| | * | | Update CHANGELOGfix-data-integrity-issue-with-repository-downloads-pathDouglas Barbosa Alexandre2016-07-211-0/+1
| | | | |
| | * | | Extract helper methods to clean up RepositoryArchiveCleanUpService specDouglas Barbosa Alexandre2016-07-211-66/+37
| | | | |
| | * | | Use Dir.mktmpdir instead of FileUtils.mkdir_p in the specDouglas Barbosa Alexandre2016-07-211-48/+56
| | | | |
| | * | | Use find instead Ruby to remove files due to performance reasonsDouglas Barbosa Alexandre2016-07-212-32/+12
| | | | |
| | * | | Cover the behavior RepositoryArchiveCleanUpService with testsDouglas Barbosa Alexandre2016-07-211-7/+89
| | | | |
| | * | | Add service to clean up repository archive cacheDouglas Barbosa Alexandre2016-07-215-35/+74
| | | | | | | | | | | | | | | | | | | | | | | | | Replace invocation of `find` with Ruby code that matches old cached files in a better, and safe way to avoid data-integrity issues.
| | * | | Avoid data-integrity issue when repository_downloads_path is incorrectlyDouglas Barbosa Alexandre2016-07-211-1/+15
| | | | |
| | * | | Update default path for repository_downloads_path in gitlab.yml.exampleDouglas Barbosa Alexandre2016-07-211-2/+2
| | | | |
| * | | | Merge branch 'pipeline-table' into 'master' Jacob Schatz2016-07-212-2/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce min width of pipeline table ## What does this MR do? Reduce min width of pipeline table ## Why was this MR needed? The current min-width is based on the heavily populated pipelines page main table. This pipeline table doesn't have nearly as much information so can be collapsed down a lot further ![table](/uploads/895d2fb2f01383a841f973e918199f55/table.gif) cc @markpundsack See merge request !5409
| | * | | | Reduce min width of pipeline tableAnnabel Dunstone2016-07-212-2/+11
| | | | | |
| * | | | | Merge branch 'fix/get-cached-rendered-html-using-single-redis-request' into ↵Douwe Maan2016-07-213-20/+30
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Retrieve rendered HTML from cache in one request ## What does this MR do? It consolidates requests made to cache store to check for cached HTML of multiple Markdown texts (for reference extracting purposes) into one request. ## Are there points in the code the reviewer needs to double check? N/A ## Why was this MR needed? To improve the performance of `Participable#raw_participants` ## What are the relevant issue numbers? #19985 ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - ~~Tests~~ - ~~[ ] Added for this feature/bug~~ - ~~[ ] All builds are passing~~ - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5406
| | * | | | Retrieve rendered HTML from cache in one requestfix/get-cached-rendered-html-using-single-redis-requestAhmad Sherif2016-07-213-20/+30
| | |/ / / | | | | | | | | | | | | | | | See #19985
| * | | | Merge branch 'rs-bulk-issues-update-spec' into 'master' Robert Speicher2016-07-212-76/+65
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Issues::BulkUpdateService spec - Create fewer Issue objects; 2 is as good as 5 for these cases. This gives us a nice little speed improvement. - Don't `describe` Symbols. - Simplify object creation. - Lessen "mystery guest" antipattern See merge request !5380
| | * | | Refactor Issues::BulkUpdateService specrs-bulk-issues-update-specRobert Speicher2016-07-202-76/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create fewer Issue objects; 2 is as good as 5 for these cases. This gives us a nice little speed improvement. - Don't `describe` Symbols. - Simplify object creation. - Lessen "mystery guest" antipattern
| * | | | Merge branch 'discussion-model' into 'master' Robert Speicher2016-07-2127-1096/+340
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Discussion model to represent MR/diff discussion Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/10325. See merge request !5376
| | * | | | Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-2027-1096/+340
| | | | | |
| * | | | | Merge branch 'ui-bug-fixes' into 'master' Robert Speicher2016-07-219-12/+46
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI bug fixes Closes #20074 Closes #20094 Regression UI bug fixes * Fix broken status icon on project page * Center tooltip on empty state in pipeline * Reduce max-width of commit title in pipeline so more fits in table * Fixes firefox rendering (icons getting cut off) * Fixes Safari rendering of SHA icon See merge request !5383
| | * | | | | Fix sha icon positioning on safariui-bug-fixesAnnabel Dunstone2016-07-211-2/+2
| | | | | | |
| | * | | | | Mobile view for commit statusAnnabel Dunstone2016-07-212-1/+10
| | | | | | |
| | * | | | | Fix ci icons getting cut offAnnabel Dunstone2016-07-215-9/+9
| | | | | | |
| | * | | | | Fix firefox rendering of SVGsAnnabel Dunstone2016-07-211-0/+1
| | | | | | |
| | * | | | | Fix icons on commits page and builds pageAnnabel Dunstone2016-07-212-1/+9
| | | | | | |
| | * | | | | Add new fork SVG to fix weird styling of other SVGsAnnabel Dunstone2016-07-211-1/+3
| | | | | | |
| | * | | | | Bug fixesAnnabel Dunstone2016-07-213-5/+19
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'bump-vmstat-version' into 'master' Stan Hu2016-07-212-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump vmstat version to fix issues reporting on FreeBSD Minor changes from 2.1.0 to 2.1.1: https://github.com/threez/ruby-vmstat/commits/master See merge request !5405
| | * | | | | Bump vmstat version to fix issues reporting on FreeBSDStan Hu2016-07-212-3/+3
| | | | | | |
| * | | | | | Merge branch 'fix-has-external-wiki-migration' into 'master' Rémy Coutable2016-07-211-2/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't drop in DropAndReaddHasExternalWikiInProjects ## What does this MR do? This MR fixes the migration in question so it doesn't first drop and then re-add a column. ## Are there points in the code the reviewer needs to double check? Not really. ## Why was this MR needed? The old migration could lead to application errors as the column would temporarily not exist between the drop column and add column statements. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/infrastructure/issues/239 ## Does this MR meet the acceptance criteria? - [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5402
| | * | | | | | Don't drop in DropAndReaddHasExternalWikiInProjectsfix-has-external-wiki-migrationYorick Peterse2016-07-211-2/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropping a column and then re-adding it can lead to the application throwing errors as the column may temporarily not exist. To work around this we'll reset the various project rows in batches _without_ removing any columns.
| * | | | | | Merge branch 'document-allow_failure-keyword' into 'master' Achilleas Pipinellis2016-07-211-23/+58
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add allow_failure CI documentation ## What does this MR do? Adds documentation for the `allow_failure` keyword for the CI. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17669 See merge request !5398
| | * | | | | Add allow_failure CI documentationdocument-allow_failure-keywordAchilleas Pipinellis2016-07-211-23/+58
| | | | | | |
| * | | | | | Merge branch '20079-new-wiki-page-500' into 'master' Stan Hu2016-07-211-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use `params[:id]` while building `markdown_preview_path`. - Closes #20079 See merge request !5400
| | * | | | | Don't use `params[:id]` while building `markdown_preview_path`.20079-new-wiki-page-500Timothy Andrew2016-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Instead, use `@page.title`, since it's always guaranteed to be around in a wiki. 2. `params[:id]` is _not_ always guaranteed to be around - if a page is created with errors, `render :edit` is called, and `params[:id]` is `nil`. 3. More context: https://gitlab.com/gitlab-org/gitlab-ce/issues/20079#note_13223240
| * | | | | | Merge branch 'fix-migration-introduced-by-5387' into 'master' Stan Hu2016-07-212-13/+14
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix migration to make it fast ## What does this MR do? Changing the migration introduced in !5387 so that it's fast. The idea is that the content of the `projects.has_external_wiki` is currently wrong, so we can just drop and recreate the column. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG needed - Tests - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5394
| | * | | | | Fix migration to make it fastRémy Coutable2016-07-212-13/+14
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix CHANGELOGRémy Coutable2016-07-211-34/+35
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch '20055-build-duration-showing-too-many-digits' into 'master' Stan Hu2016-07-212-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cast duration to integer in `TimeHelper#time_interval_in_words` Fixes #20055. - [x] No CHANGELOG since it fixes a regression introduced in RC12. - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5391