- 10 Oct, 2016 17 commits
-
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Kamil Trzciński authored
Fix ci pipeline processing with async jobs ## What does this MR do? This MR fixes CI pipeline processing with asynchronous jobs called from `around_transition` provided by state machine. For details see https://github.com/pluginaweek/state_machine/issues/191 and commit f68acbac. ## Why was this MR needed? Recently merged https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6650 introduced problem with asynchronous job being deployed when `around_transition` still held transaction, which caused race condition that prevented pipeline status to change in a proper way. ## What are the relevant issue numbers? Closes #23111 See merge request !6736
-
Sean McGivern authored
Correct namespace validation to forbid bad names #21077 ## What does this MR do? Updates master namespace regex to forbid any namespace ending in `.git` or `.atom` and corrects and adds relevant tests ## Are there points in the code the reviewer needs to double check? I think it's all good. I could use help with the creation of tests for usernames with trailing `.atom` or `.git` as the testing framework is a bit over my head. ## Why was this MR needed? A group that ends in `.atom` will cause the relevent dashboard to crash if the user (ANY user, not just the creator) has visibility of the group until it is deleted through the admin panel (it cannot be renamed, the edit page will crash. It may be fixable through the API, that wasn't checked.) This allows a malicious user with group creation privileges to bulk add users to a group, rename the group to a bad name, and crash the groups dashboard for all members of the group. The same applies if the group is internal or public and users navigate to the explore tab of the groups dashboard. The same applies to usernames ending in `.atom`. In many places of the code, it implies that `.git` in not allowed at the end of namespaces, but many allowed it anyway. This MR forbids it everywhere to prevent potential issues (like the one with `.atom` going forward). ## What are the relevant issue numbers? Group path validation incomplete, crashes groups dashboard #21077 ## 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 - [X] Added for this feature/bug - [X] 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 !5994
-
Achilleas Pipinellis authored
Fix a typo in doc/api/labels.md See merge request !6760
-
Rémy Coutable authored
Fix wrong icon in CI build detail sidebar: right-arrow => arrow-right ## What does this MR do? It fixes a wrong icon name in the build detail page's sidebar: `right-arrow` should be `arrow-right`! ## Are there points in the code the reviewer needs to double check? No. Closes #23123 See merge request !6768
-
Jacob Schatz authored
Prevent running GfmAutocomplete setup for each diff note ## What does this MR do? Debounces GfmAutoComplete.setup. ## Why was this MR needed? See https://gitlab.com/gitlab-org/gitlab-ce/issues/22704 Major lag on MR screens with many diff notes. ## 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 - [ ] 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 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/22704 See merge request !6569
-
Sean McGivern authored
Make searching for commits case insensitive. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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? Fixes #21800 See merge request !6715
-
Douwe Maan authored
Update Gitlab Shell to fix errors moving projects between storages ## What does this MR do? Update Gitlab Shell to fix errors moving projects between storages ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? We are unable to move projects using `ionice` because of an error in the current version of gitlab-shell. This brings the changes of https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/96 and https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/97 ## 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 - [ ] 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? Related to https://gitlab.com/gitlab-com/infrastructure/issues/513 See merge request !6751
-
Yorick Peterse authored
Try tmpfs for repository storage, etc See merge request !6730
-
Yorick Peterse authored
Improve project policy specs See merge request !6442
-
Robert Speicher authored
reword title for issues_controller#show and issues_controller#edit Closes #21712 See merge request !6503
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Prevent conflict b/w search field and its dropdown What does this MR do? Stops the global search form's default "action" from fighting with dropdown items when using the keyboard to navigate the dropdown. `e.preventDefault()` is now called on the enter key when a dropdown item is already selected. Closes #22872 See merge request !6643
-
Brennan Roberts authored
Stop the global search form's default "action" from fighting with dropdown items when using the keyboard to navigate the dropdown. `e.preventDefault()` is now called on the enter key when a dropdown item is already selected. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Adam Niedzielski authored
Fixes #21800.
-
- 09 Oct, 2016 2 commits
-
-
Greg Laubenstein authored
-
Lemures Lemniscati authored
-
- 08 Oct, 2016 8 commits
-
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Stan Hu authored
Fix missing constraints causing route failures when usernames with periods are used Closes #23131 See merge request !6758
-
Stan Hu authored
Closes #23131
-
Stan Hu authored
Use Hash rocket syntax to maintain Ruby 2.1 compatibility in spec Builds in Ruby 2.1 specs were failing in master: https://gitlab.com/gitlab-org/gitlab-ce/builds/4883142 See merge request !6756
-
Stan Hu authored
-
- 07 Oct, 2016 13 commits
-
-
Annabel Dunstone Gray authored
Truncate long labels with ellipsis in labels page ## What does this MR do? Fixes #22953, where long labels overlaps into the description field in the labels page. Truncates long labels with ellipsis. Labels that fit are unaffected. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Fixes #22953. ## Screenshots (if relevant) Existing behavior: ![image](/uploads/4d85730fe9d039d91036d09bf892d9f2/image.png) With the change: ![desktop](/uploads/6866389cc3a1e2af5c2def59536a2a7c/desktop.png) ![mobile](/uploads/3d1fbb4a3470abefdd3670f7a794d2a8/mobile.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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 #22953 See merge request !6725
-
Stan Hu authored
Improve the contribution and MR review guide ## What does this MR do? This merge request improves the contributing and MR review guides following @stanhu's reply on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6096#note_16537211. ## Why was this MR needed? To clearly state that MR reviews can take multiple iterations but that as reviewers we should do our best to minimize the number of iterations and take over any MR that is set as "Merge when build succeeds" at some point. See merge request !6739
-
Alejandro Rodríguez authored
-
Will Starms authored
Adds .git and .atom to the master namespace regex Updates existing group tests and adds two new ones Updates path cleaning to also forbid .atom
-
Yorick Peterse authored
ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job… See merge request !6732
-
Rémy Coutable authored
Fix Ubuntu 16.04.1 update process using systemctl daemon-reload See merge request !6666
-
Jacob Schatz authored
Resolve "Retouch environments list and deployments list" ## What does this MR do? #### Environments List - Fixes deployment ID - Removes bold styling from deployment ID - Changes Las Deployment Column to have '#ID by user' - Adds build column with link to the build - Adds external url to where the environment is hosted #### Environment Details - Add link to the build column and changes content to show "build (#id) by user" - Adds external link to the review app Adds tests ## Screenshots (if relevant) #### Environments List ![env_list](/uploads/6cfd737bb0d2f2853a610479877de5a3/env_list.png) #### Environments Details ![env_details](/uploads/70ec59d7d7de5c1ef57132c2ec9c1b8f/env_details.png) ## 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 - [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) - [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22774 See merge request !6691
-
Robert Speicher authored
Make Member#add_user set access_level for requesters ## What does this MR do? This is a backport of https://gitlab.com/gitlab-org/gitlab-ee/commit/c902d8d48409a4d46f7669fc5fc85b9ba86e71d6 from gitlab-org/gitlab-ee!744. ## Why was this MR needed? This change is only used in EE right now, but there's no reason why it wouldn't be part of CE. See merge request !6649
-
Bryce Johnson authored
-
Rémy Coutable authored
Optimize the `award_user_list` helper spec According to https://gitlab.com/gitlab-org/gitlab-ce/issues/23034#note_16586657, each test for this helper generated 1,833 queries. Now we only generate stubbed records, and only as many as we need for each test. This also corrects a slight logic bug in the helper itself. When the number of awards was greater than the limit (9 by default), _and_ the current user was one of them, we actually included 10 names, including "You", plus the remaining count. Now we return the correct number regardless. See merge request !6722
-
Filipa Lacerda authored
-
Sid Sijbrandij authored
Added missing content and improved layout ## What does this MR do? Restores lost content that was removed from the University landing page. Adds many videos, presentations and blog articles that were never in University. Improves the layout of the content. ## Are there points in the code the reviewer needs to double check? I'd like feedback on the content organisation, specifically if certain sub sections should be moved e.g. from Beginner to Intermediate. Keep in mind how this change will affect the relative difficulty of the other content. ## Why was this MR needed? The layout looked unprofessional and was missing crucial content. ## What are the relevant issue numbers? Closes #23051 See merge request !6741
-
Robert Speicher authored
According to https://gitlab.com/gitlab-org/gitlab-ce/issues/23034#note_16586657, each test for this helper generated 1,833 queries. Now we only generate stubbed records, and only as many as we need for each test. This also corrects a slight logic bug in the helper itself. When the number of awards was greater than the limit (9 by default), _and_ the current user was one of them, we actually included 10 names, including "You", plus the remaining count. Now we return the correct number regardless.
-