summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add light border to rounded avatarsdz-avatar-borderDmitriy Zaporozhets2016-07-224-15/+13
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch '20121-make-spec-mailers-notify_spec-rb-more-robust' into 'master' Rémy Coutable2016-07-221-1/+1
|\ | | | | | | | | | | | | Make Notify specs more robust by setting up assignee names Closes #20121. See merge request !5427
| * Make Notify specs more robust by setting up assignee namesRémy Coutable2016-07-221-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'doc-refactor-storage-path' into 'master' Achilleas Pipinellis2016-07-223-10/+73
|\ \ | | | | | | | | | | | | | | | | | | Refactor repository storages documentation Use detailed information on using the multiple repository storage feature See merge request !5428
| * | Refactor repository storages documentationAchilleas Pipinellis2016-07-223-10/+73
| |/ | | | | | | [ci skip]
* | Update VERSION to 8.11.0-prev8.11.0.preRémy Coutable2016-07-222-2/+2
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch ↵Achilleas Pipinellis2016-07-222-3/+4
|\ | | | | | | | | | | | | | | | | | | '20107-update-documentation-according-to-the-new-multiple-repository-storage-paths-feature' into 'master' Update documentation according to the new multiple git mount points feature Closes #20107 See merge request !5411
| * Update documentation according to the new multiple git mount points feature20107-update-documentation-according-to-the-new-multiple-repository-storage-paths-featureAlejandro Rodríguez2016-07-212-3/+4
| |
* | Merge branch 'docs-refactor-slack-service' into 'master' Achilleas Pipinellis2016-07-224-55/+39
|\ \ | | | | | | | | | | | | | | | | | | Refactor Slack service documentation See merge request !5421
| * | Refactor Slack service documentationAchilleas Pipinellis2016-07-224-55/+39
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'doc_new_admin_area' into 'master' Achilleas Pipinellis2016-07-229-22/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move admin application settings to own path Move existing documentation to its own `user/admin_area/settings` path. See merge request !5420
| * | | Move admin application settings to own pathAchilleas Pipinellis2016-07-229-22/+28
| |/ / | | | | | | | | | [ci skip]
* | | Merge branch 'doc-protected-branches' into 'master' Achilleas Pipinellis2016-07-2214-63/+116
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor protected branches documentation Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19832 See merge request !5419
| * | | Fix failing spec on help controllerAchilleas Pipinellis2016-07-221-1/+1
| | | |
| * | | Refactor protected branches documentationAchilleas Pipinellis2016-07-2213-62/+115
| |/ /
* | | Merge branch 'artifacts-from-ref-and-build-name-api' into 'master' Rémy Coutable2016-07-223-10/+44
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simpler two queries than one JOIN with subquery This is a follow up from !5347 Originally it was: ``` ruby pipeline = pipelines.latest_successful_for(ref) builds.where(pipeline: pipeline).latest.with_artifacts ``` However MySQL would complain that we can't use `IN` against a subquery which has `LIMIT`. Using `INNER JOIN` would be a workaround, however, doing that is too complicated in current version of Rails. So let's just use two queries in this case. Closes #14419 See merge request !5388
| * | Also fix the URL in the commentartifacts-from-ref-and-build-name-apiLin Jen-Shin2016-07-211-1/+1
| | |
| * | Fix URL in the documentationLin Jen-Shin2016-07-211-2/+2
| | |
| * | Add API documentation for downloading the latest successful buildAchilleas Pipinellis2016-07-211-2/+36
| | |
| * | Since it's too hard to use JOIN with Rails... feedback:Lin Jen-Shin2016-07-211-7/+7
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13204564
* | | 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
| | | | | | |
View Lorry Controller Status