- 04 Nov, 2016 40 commits
-
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
* upstream/master: (74 commits) Fetch locals to avoid undefined method/local error Remove author according to the document Simplify implementation of entity serializers Add documentation for the "Only allow merge requests to be merged if all discussions are resolved" feature Complete and improve specs Add setting to only allow merge requests to be merged when all discussions are resolved Apply `*_params_ce + *_params_ee` pattern to MergeRequestsController Add tests for deployment and environment entitites Add tests for serialization entities, add user entity Only skip group when it's actually a group in the "Share with group" select Fix: Todos Filter Shows All Users Fix: Guest sees some repository details and gets 404 Move shared params to a helper GrapeDSL for project hooks Update commits.scss updated styling commit SHA on branches page + added to changelog change build list height to show 6,5 builds + improve padding of list, with first/last child selectors Refine build entity tests a little Expose commit author if author exists Ignore builds directory from eslint ...
-
Rémy Coutable authored
Show pipeline status from branch and commit than only commit Closes #23615 See merge request !7034
-
Rémy Coutable authored
Updates deckar01-task_list gem to its latest version See merge request !7185
-
Douwe Maan authored
Add serializer for environments ## What does this MR do? This will make it possible to create a payload need in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7015 for use with Vue. ## Why was this MR needed? Closes #23886 See merge request !7174
-
Rémy Coutable authored
-
Rémy Coutable authored
See merge request !7014 Signed-off-by:Rémy Coutable <remy@rymai.me>
-
Robert Speicher authored
Apply `*_params_ce + *_params_ee` pattern to MergeRequestsController See merge request !7263
-
Douwe Maan authored
Add setting to only allow merge requests to be merged when all discussions are resolved _Originally opened at !6385 by @rodolfoasantos._ - - - ## What does this MR do? Based on #20968 this merge request adds setting only to allow merge requests to be merged when all discussions are resolved. ## Are there points in the code the reviewer needs to double check? Check if there are other points to add the resolved discussion setting ## Why was this MR needed? Add the possibility to configure the project to only accept merge request when all discussions are resolved ## Screenshots   ## 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] API support added - Tests - [x] Added for this feature/bug - [ ] 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 you do - 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 #20968 See merge request !7125
-
-
-
Lin Jen-Shin authored
* upstream/master: (35 commits) Only skip group when it's actually a group in the "Share with group" select Fix: Todos Filter Shows All Users Fix: Guest sees some repository details and gets 404 Move shared params to a helper GrapeDSL for project hooks Update commits.scss updated styling commit SHA on branches page + added to changelog change build list height to show 6,5 builds + improve padding of list, with first/last child selectors Ignore builds directory from eslint Add changelog entry Document multiple repository storage paths Allow multiple repository storage shards to be enabled, and automatically round-robin between them Cleaned up global namespace JS Add tip for using Chrome to run and debug teaspoon tests. Add CHANGELOG entry file Add jquery.timeago.js to application.js Update match-regex to fix filename convention Move jquery.timeago to vendor directory Change a bunch of doc links to either relative or https://docs.gitlab.com. Show log corresponding to env in admin/logs ...
-
Rémy Coutable authored
GrapeDSL for project hooks See merge request !6963
-
Sean McGivern authored
Fix: Todos Filter Shows All Users Closes #22588 See merge request !7258
-
Grzegorz Bizon authored
-
Rémy Coutable authored
Add documentation for the "Only allow merge requests to be merged if all discussions are resolved" feature Signed-off-by: -
Rémy Coutable authored
Signed-off-by: -
Rodolfo Santos authored
Signed-off-by: -
Robert Speicher authored
-
Robert Speicher authored
Only skip group when it's actually a group in the "Share with group" select Fixes #23961 See merge request !7262
-
Robert Speicher authored
Update rdoc to `~> 4.2` Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2814 See merge request !7261
-
Robert Speicher authored
Backport Group API code that was added in EE only Group API code that was added in EE only. /cc @vsizov See merge request !7205
-
Grzegorz Bizon authored
-
Sean McGivern authored
Fix: Guest sees some repository details and gets 404 Closes #24056 See merge request !7222
-
Grzegorz Bizon authored
-
Rémy Coutable authored
Signed-off-by: -
Valery Sizov authored
-
Douwe Maan authored
Resolve "Introduce round-robin project creation to spread load over multiple shards" ## What does this MR do? Allow multiple shards to be enabled in the admin settings page, balancing project creation across all enabled shards. ## Are there points in the code the reviewer needs to double check? * `f.select ..., multiple: true` isn't the most beautiful UI in the world, but switching to `collection_check_boxes` (or a facsimile thereof) isn't trivial * Should `pick_repository_storage` be a method of `ApplicationSetting`, or `Project`? It's going to accrete logic over time so perhaps it should be its own class already? * This is written to avoid the need for a database migration, so it is`serialize :repository_storage` without `, Array`. This is tested, but alternatives include: * Add a database migration * Write a custom Coder that will accept a String or Array in `load` and always `dump an Array. ## Why was this MR needed? ## Screenshots (if relevant)  ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry 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 - [ ] 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 #24059 See merge request !7273
-
Achilleas Pipinellis authored
Clarify NGINX config setup These changes are to clarify that the paths may need to be changed in the NGINX config file depending on where GitLab is installed. See merge request !6834
-
Achilleas Pipinellis authored
Fix Docs links This fixes some links in the docs to either be relative or to use HTTPS and docs.gitlab.com. See merge request !7280
-
Valery Sizov authored
-
Rémy Coutable authored
Issues atom feed url reflect filters on dashboard Makes the issue atom feed url reflect the selected filters on the issue dashboard page and project's issues page. ## Are there points in the code the reviewer needs to double check? The solution isn't based on javascript and filters functionality but on the current url parameters. It didn't seem right especially when writing tests. ## Why was this MR needed? After filtering the issues, users may press the feed button and see a different list of issues to what is shown on the HTML page Closes #22947 See merge request !7259
-
Fatih Acet authored
Updated styling commit SHA on branches page ## What does this MR do? Updated styling of commit SHA on the branches page to include the commit icon and be blue ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? to make the branches page in line with upcoming update to the commit list, which also styles the commit sha, but slightly different. ## Screenshots (if relevant) before:  after:  ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 - [ ] 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 #24022 See merge request !7219
-
Z.J. van de Weg authored
-
Z.J. van de Weg authored
-
Sean McGivern authored
Make specs a bit faster See merge request !6992
-
Sean McGivern authored
Show log corresponding to env in admin/logs Closes #23979 See merge request !7191
-
Fatih Acet authored
Merge branch '24017-long-build-list-dropdowns-which-scroll-are-not-immediately-obvious' into 'master' change build list height to show 6,5 builds + improve padding of list, with firs… ## What does this MR do? lets the builds dropdown in the pipeline graph show only 6,5 builds instead of 7.. so its easier to know if a user can scroll ## Are there points in the code the reviewer needs to double check? I changed the padding of the list to 0 and gave the 8px top and bottom padding from the `ul` to the `first-child` and `last-child` li elements inside the list. Is that okey. Reason why, is that it breaks the list off correctly at the edges:)  vs  ## Why was this MR needed? easier to let people know when its possible to scroll.. to expect more builds ## Screenshots (if relevant)  ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 - [ ] 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 #24017 See merge request !7210
-
Dimitrie Hoekstra authored
-
Dimitrie Hoekstra authored
-
