GitLab FOSS merge requestshttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests2017-04-11T17:23:03Zhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9699Fix error messages on project settings page2017-04-11T17:23:03Zusername-removed-426032Fix error messages on project settings page## What does this MR do?
This MR displays error messages always on top of the project settings page. It also displays the error message if the request is not an AJAX request (happens when the user selects an avatar image).
## Why was t...## What does this MR do?
This MR displays error messages always on top of the project settings page. It also displays the error message if the request is not an AJAX request (happens when the user selects an avatar image).
## Why was this MR needed?
To always show an error message (for AJAX and normal requests).
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24319username-removed-426032username-removed-426032https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9717WIP: Add network graph view to default project views2017-03-08T15:19:08Zusername-removed-426032WIP: Add network graph view to default project views## What does this MR do?
It adds a `Network graph` option to the list of project views on the user preferences page. When selected, the default project view will render the network graph.
## Why was this MR needed?
To extend the...## What does this MR do?
It adds a `Network graph` option to the list of project views on the user preferences page. When selected, the default project view will render the network graph.
## Why was this MR needed?
To extend the options for default project views.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #18330https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9754Move KaTeX javascript bundle to webpack config2017-03-07T08:57:19Zusername-removed-636429Move KaTeX javascript bundle to webpack config## What does this MR do?
Moves `katex.js` compilation from Sprockets to webpack.
## Are there points in the code the reviewer needs to double check?
KaTeX within GitLab-flavored markdown should still render correctly.
## Why was this...## What does this MR do?
Moves `katex.js` compilation from Sprockets to webpack.
## Are there points in the code the reviewer needs to double check?
KaTeX within GitLab-flavored markdown should still render correctly.
## Why was this MR needed?
Attempting to move all javascript compilation away from Sprockets so that several Ruby gems can be removed.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
#27486https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9763WIP: Replace jQuery old-style ajax calls with Promise interface2017-08-26T03:38:36Zusername-removed-100770WIP: Replace jQuery old-style ajax calls with Promise interface## What does this MR do?
Replace jQuery old-style ajax calls with Promise interface (Deferred objects).
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
Old-style jQuery Ajax calls s...## What does this MR do?
Replace jQuery old-style ajax calls with Promise interface (Deferred objects).
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
Old-style jQuery Ajax calls should be removed as jQuery will not be removed in the near future.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #29105username-removed-100770username-removed-100770https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9768WIP: Expand InternalID to optionally carry a runtime-generated slug, see #287952017-03-24T16:38:40Zusername-removed-426456niv@nwnx.ioWIP: Expand InternalID to optionally carry a runtime-generated slug, see #28795## What does this MR do?
Show the title of models that have a InternalID in the url.
* Works for Issues, Merge Requests, and Milestones.
* Slugs are always lowercase and can only contain a-z, 0-9, and -.
* The slug is generated a...## What does this MR do?
Show the title of models that have a InternalID in the url.
* Works for Issues, Merge Requests, and Milestones.
* Slugs are always lowercase and can only contain a-z, 0-9, and -.
* The slug is generated at runtime when the owning model has a :title attr;
it is not stored on the model.
* The slug generation is in InternalId#make_iid_slug, as the two are closely
linked.
Still missing:
* No link rel=canonical.
* The url in the browser is not updated with replaceState yet when coming from
other places with a old/different slug.
* No specs yet, as specs don't go through to_param so they never see the slug,
as far as I can tell. Should this be changed?
Possibly room for improvement:
* The route constraint RX could maybe be moved elsewhere?
* The model scope/finder (where: iid) still works even with sluggified IIDs
because to_i just truncates after the -. I think this is fine?
* Also, better slug pattern?
## Are there points in the code the reviewer needs to double check?
Ah, all of them! I'd like to bounce off for feedback and then work the rest out.
## Why was this MR needed?
Feature request in #28795
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #28795username-removed-426456niv@nwnx.iousername-removed-426456niv@nwnx.iohttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9842Add endpoints to list projects for a user2017-03-21T16:34:31Zusername-removed-419655Add endpoints to list projects for a user## What does this MR do?
Add endpoints to list projects for a user
This addition to the API provides project lists like the user profile
* Personal projects
* Contributed projects
## Does this MR meet the acceptance criteria?
- [x] ...## What does this MR do?
Add endpoints to list projects for a user
This addition to the API provides project lists like the user profile
* Personal projects
* Contributed projects
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #179319.1username-removed-419655username-removed-419655https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9879WIP: compile scss with webpack2018-11-24T17:04:40ZSimon KnoxWIP: compile scss with webpack## What does this MR do?
Build styles with webpack
Currently works enough for me to get sourcemaps and most styles work, needs a bunch more polish and remaining things
## TODO
- [ ] some sprocket `require`s in main.scss (requ...## What does this MR do?
Build styles with webpack
Currently works enough for me to get sourcemaps and most styles work, needs a bunch more polish and remaining things
## TODO
- [ ] some sprocket `require`s in main.scss (requires images in url-loader)
- [ ] replace image-url with url (requires images in url-loader)
- [ ] autoprefixer?
- [ ] mail stylesheets
- [ ] bring back print.css
- [ ] mysterious charset error in css - https://github.com/webpack-contrib/css-loader/issues/355
- [ ] confirm prod build for url resolving of assets
- [ ] `loader`/`use` for css loader config
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #29346https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9970Use find_each which is easier on memory usage2017-03-15T16:35:44ZKamil TrzcińśkiUse find_each which is easier on memory usage## What does this MR do?
Improves memory efficiency of `builds/register` endpoint.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the a...## What does this MR do?
Improves memory efficiency of `builds/register` endpoint.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10025WIP: POC for zero downtime migrations without having to manually manage what ...2017-03-17T14:08:00ZDouwe MaanWIP: POC for zero downtime migrations without having to manually manage what migration goes into what release@yorickpeterse @rspeicher @smcgivern @stanhu I'd like to get your thoughts on this.
This is a POC for zero downtime migrations where the developer and release managers don't have to manually manage what migration goes into what releas...@yorickpeterse @rspeicher @smcgivern @stanhu I'd like to get your thoughts on this.
This is a POC for zero downtime migrations where the developer and release managers don't have to manually manage what migration goes into what release, everything can be merged at one time in one MR, and GitLab itself is instead responsible for performing the right migrations and the right code level changes (like automatically writing to the new column, or ignoring the old column) at the right times.
This will potentially make developer and RMs lives a lot easier, while reaching the same result as described in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9976.
This POC just covers renaming a column, but can easily be adapted to do the same for other kinds of changes, by adding a `ChangeableColumnType` module based on `RenameableColumn`, for example, with migrations to match.
The example renames `users.username` to `users.handle` in 3 steps, that are only run by `rake db:migrate` when `VERSION` holds the right release:
- 9.0.0 - Add `handle` column
- 9.0.0 - (post deploy) Migrate data from `username` to `handle`
- 9.0.1 - Remove `username` column
You can try it out by playing with the version number in `VERSION`, running `rake db:migrate`, and then running `rails console`. You'll see instructions for what to do with the code logged as info to `log/development.log` or as a warning to STDOUT after the final migration has run, and you'll be able to see that the right ignores, aliases and automatic writes to the new column will be set up depending on what migrations have run. Use `rake db:rollback STEP=n` if you get scared and want to take `n` steps back.
A downside is that since these future migrations are not actually run locally _or_ on CI, `db/schema.rb` isn't updated, and there's no way of knowing for sure if code will really continue to work once the migrations "magically" run on production. Which is of course a bad thing. Developers can run these migrations locally by toying with `VERSION`, but we can't be sure that they actually did this, and we can't expect them to run all specs locally.
To resolve this, we could only move migrations from `db/release_migrations/[version]` to `db/migrate` or `db/post_migrate` at release time (by the release-tools) in a commit that also updates `db/schema.rb` and subsequently gets its pipeline run. There would not be any extra code changes required at that point if the developer followed the instructions that `RenameableColumn` outputs, since `RenameableColumn` automatically makes appropriate runtime changes by looking at what migrations have run.
To make this easier to use for developers, we can add a generator that automatically generates the 3 migration files in the right places, adds the `rename_column` call to `User`, and again prints instructions on what code changes (not) to make.
It may also be worth considering using an `unreleased` folder like we do for changelogs, so that the user doesn't need to predict what release the MR will go into. Note that it's fine if the there are migrations for `9.0.1`, and `9.0.1` is never released, since migrations are run when the current release >= the specified release. This means that these migrations would be run in `9.1.0`, which is still after `9.0.0`, as intended. It's NOT fine if the migrations are in `9.0.0` and `9.0.1` folders, and the MR as a whole ends up being released in 9.0.1 rather than 9.0.0, since then all migrations will happen at the same time, instead of with the intended wait of one release.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10027Fix margin issue between buttons on pipeline page2017-03-24T13:12:26Zusername-removed-663219Fix margin issue between buttons on pipeline page## What does this MR do?
Fix a margin between two buttons, as requested in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9391#note_24068315
## Are there points in the code the reviewer needs to double check?
There was a...## What does this MR do?
Fix a margin between two buttons, as requested in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9391#note_24068315
## Are there points in the code the reviewer needs to double check?
There was an extra whitespace character between the buttons that didn't appear in other places. Really hard to track it down. Finally I followed an example from `app/views/projects/commit/_commit_box.html.haml` and put the text for the `Retry` button in a `do` loop in the Haml file, and that got rid of the space. Weird...
## Screenshots (if relevant)
Before:
![2017-03-16_2046](/uploads/df3d6a7de9089ce7e05e65ad10c291de/2017-03-16_2046.png)
After:
![2017-03-16_2044](/uploads/10b7ac7b11f09ecf1a9884cfaec6f2c4/2017-03-16_2044.png)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)9.1username-removed-663219username-removed-663219https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10072WIP: remove underscore - use lodash and babel plugin2017-09-05T14:34:28Zusername-removed-642931git@selfup.meWIP: remove underscore - use lodash and babel plugin## What does this MR do?
It removes the non tree-shakeable underscore and uses lodash instead (which is also faster :smile:)
## Are there points in the code the reviewer needs to double check?
All of the things
## Why was thi...## What does this MR do?
It removes the non tree-shakeable underscore and uses lodash instead (which is also faster :smile:)
## Are there points in the code the reviewer needs to double check?
All of the things
## Why was this MR needed?
Because sanity and performance
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
#231109.1https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10083WIP: Change rounding on code coverage badge to be consistent with other displays2017-05-15T00:40:39Zusername-removed-235897WIP: Change rounding on code coverage badge to be consistent with other displays## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs....## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #25327https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10212Add nginx config for acme challenge2017-04-14T22:12:05Zusername-removed-536426Add nginx config for acme challenge## What does this MR do?
Adds Nginx config to allow for acme challenges, for services such as LetsEncrypt
## Are there points in the code the reviewer needs to double check?
That there are no Nginx syntax errors and starts correctly
...## What does this MR do?
Adds Nginx config to allow for acme challenges, for services such as LetsEncrypt
## Are there points in the code the reviewer needs to double check?
That there are no Nginx syntax errors and starts correctly
## Why was this MR needed?
LetsEncrypt is becoming more popular and currently to use it you either need to manually change the Nginx config, or stop GitLab to free up port 80.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?username-removed-536426username-removed-536426https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10241use assigned_open_merge_request/issues_count in dashboard2017-05-15T16:27:03Zusername-removed-203749use assigned_open_merge_request/issues_count in dashboard## What does this MR do?
https://gitlab.com/gitlab-org/gitlab-ce/commit/bfccea370310d6f7e5fe16c846ccd073d487a97f and https://gitlab.com/gitlab-org/gitlab-ce/commit/8835b7889a6265aba3c6d7ee241abf80a1cf07f3 add assigned issues/mrs to cache...## What does this MR do?
https://gitlab.com/gitlab-org/gitlab-ce/commit/bfccea370310d6f7e5fe16c846ccd073d487a97f and https://gitlab.com/gitlab-org/gitlab-ce/commit/8835b7889a6265aba3c6d7ee241abf80a1cf07f3 add assigned issues/mrs to cache, and update them when assignee changed.
This commit https://gitlab.com/gitlab-org/gitlab-ce/commit/8c3e6987d931847b72752dfcac4215dbdc47fd88 add assigned issues/mrs count
to cache again and cached for two minutes.
It may be better to use `assigned_open_merge_request_count` and `assigned_open_issues_count`.
## Does this MR meet the acceptance criteria?
- Tests
- [ ] All builds are passinghttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10247Improve database yml examples2017-10-24T23:59:23Zusername-removed-438733bogdanvlviv@gmail.comImprove database yml examplesThis MR
- adds to `config/database.yml.mysql` 'Staging specific' and more consistent template with `config/database.yml.postgresql` and `config/database.yml.env`
- adds to `config/database.yml.postgresql` option - `host`, because it ...This MR
- adds to `config/database.yml.mysql` 'Staging specific' and more consistent template with `config/database.yml.postgresql` and `config/database.yml.env`
- adds to `config/database.yml.postgresql` option - `host`, because it is omitted by defaultusername-removed-438733bogdanvlviv@gmail.comusername-removed-438733bogdanvlviv@gmail.comhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10289WIP: Persist performance metrics for a Merge Request within GitLab2017-07-28T15:10:57Zusername-removed-676946WIP: Persist performance metrics for a Merge Request within GitLab## What does this MR do?
Stores Prometheus metrics in `stored_metrics` table that the can be used to access them later
## Why was this MR needed?
Prometheus removes metrics after some (configurable) time. Additionally Prometheus i...## What does this MR do?
Stores Prometheus metrics in `stored_metrics` table that the can be used to access them later
## Why was this MR needed?
Prometheus removes metrics after some (configurable) time. Additionally Prometheus is not recommended as long term storage for metrics.
Thus to be able to reliably access data used for 'Spark Line' metrics in merge request we need to store them in the database.
Storing is performed by dedicated worker that is scheduled to runes 30 minutes after deployment is created.
This MR is based on !9950 and before that MR is merged to master. This MR will also contain the code.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #27545username-removed-676946username-removed-676946https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10301WIP:Load sketch43 JSON file.2019-09-20T01:18:18ZJacob SchatzWIP:Load sketch43 JSON file.<del>Can't get it working yet. For some reason blobs won't load. Many different ways in there.</del>
Image (png) now loads! :tada:
closes #30121
cc @iamphill @selfup <del>Can't get it working yet. For some reason blobs won't load. Many different ways in there.</del>
Image (png) now loads! :tada:
closes #30121
cc @iamphill @selfup Jacob SchatzJacob Schatzhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10332Hide issues and MRs in labels list if disabled2017-05-17T17:18:28Zusername-removed-143453sophie@hemio.deHide issues and MRs in labels list if disabled## What does this MR do?
Hide view issues and merge requests from labels list if the project has issues or merge request disabled.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
The lin...## What does this MR do?
Hide view issues and merge requests from labels list if the project has issues or merge request disabled.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
The links lead to an error page if the features were disabled for the project.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?username-removed-143453sophie@hemio.deusername-removed-143453sophie@hemio.dehttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10355WIP: Download patch with code comments for unresolved discussions2017-07-28T15:09:54ZDouwe MaanWIP: Download patch with code comments for unresolved discussions/cc @rspeicher @smcgivern
Example patch:
```patch
From 80ed295019941ebaf3377c7202c9120ea932425e Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Thu, 30 Mar 2017 17:18:32 -0600
Subject: [PATCH] FIXME: Add code co.../cc @rspeicher @smcgivern
Example patch:
```patch
From 80ed295019941ebaf3377c7202c9120ea932425e Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Thu, 30 Mar 2017 17:18:32 -0600
Subject: [PATCH] FIXME: Add code comments for unresolved discussions from
gitlab-org/gitlab-ce!8
All unresolved non-outdated diff discussions from this merge request are
added in the relevant places as code comments with a 'FIXME' prefix.
This commit was automatically generated by GitLab. Be sure to remove it
from your branch before the merge request is merged.
---
app/models/user.rb | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/app/models/user.rb b/app/models/user.rb
index 2db35dc2be..5636d1ae11 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -94,6 +94,11 @@ class User < ActiveRecord::Base
# the user is destroyed. If the user owns any issues during deletion, this
# should be treated as an exceptional condition.
has_many :issues, dependent: :restrict_with_exception, foreign_key: :author_id
+ # FIXME: Administrator (@root) started a discussion on the previous line:
+ # Should we do the same for notes?
+ #
+ # FIXME: Administrator (@root) commented:
+ # I guess we can do that later
#
# Validations
@@ -334,6 +339,8 @@ class User < ActiveRecord::Base
ghost_user ||
begin
users = Enumerator.new do |y|
+ # FIXME: Administrator (@root) started a discussion on the previous line:
+ # This is pretty hard to understand
n = nil
loop do
user = User.new(
--
2.11.0
```
To do:
- [ ] Cache commit
- [ ] Consider including discussions on deleted lines
- [ ] Consider including outdated diff discussions
- [ ] Consider including non-diff discussions
- [ ] Comments in more languages
- [ ] Improve text in modal
- [ ] Specs
- [ ] DocsDouwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10384WIP: Resolve ""New branch" slash command"2017-04-24T09:45:26Zusername-removed-1117323WIP: Resolve ""New branch" slash command"## What does this MR do?
It adds an extra slash command "/branch" to the issue comment section.
## Are there points in the code the reviewer needs to double check?
The DSL for slash commands does not have a way for params to be option...## What does this MR do?
It adds an extra slash command "/branch" to the issue comment section.
## Are there points in the code the reviewer needs to double check?
The DSL for slash commands does not have a way for params to be optional, even though the `command_definition_spec.rb` file has a test for it. I have added in a new DSL keyword `optional_params` in `CommandDefinition` class to allow for this.
## Why was this MR needed?
Resolution for issue #27801.
## Screenshots (if relevant)
![screenshot](http://i.imgur.com/W3zIEIE.png)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #278019.2username-removed-1117323username-removed-1117323