- 25 Nov, 2016 4 commits
-
-
Luis Alonso Chavez Armendariz authored
-
Robert Speicher authored
Rephrase some system notes to be compatible with new system note style See merge request !7692
-
Robert Speicher authored
Make test suite deterministic when storage is involved ## What does this MR do? This MR fixes our RSpec test harness because one test example could affect subsequent examples if objects created with `let` had associated files stored in `tmp/tests`. We store files using CarrierWave, but we also have some custom storage rules for CI builds. Some time ago we introduced MR that purged CarrierWave uploads after each run of entire test suite https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3435, but this is not enough, as we should isolate each test example to be able to rely on deterministic test suite. Not cleaning uploads between each test example run, makes it impossible to know if preconditions are correct before test example starts to run, therefore it makes test examples, that use storage, unreliable. This MR is an attempt to improve that. ## What are the relevant issue numbers? Closes #24808 See merge request !7695
-
Robert Speicher authored
Update grape-entity to 0.6.0 See merge request !7491
-
- 24 Nov, 2016 36 commits
-
-
Fatih Acet authored
resolves updated and resolved status is not showing ## What does this MR do? This MR fixes #24780 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? This MRs removes some important information as par suggested design in #19797. it restores that information ## Screenshots (if relevant) **Before:** ![before](/uploads/a93091e783de3e550a07ddbc1fa8085a/before.png) **After:** ![after](/uploads/ceb7f64a6f20155abcf6ea49d4b8059e/after.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 - [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24780 See merge request !7655
-
Fatih Acet authored
Fixed resolved discussion timeago not rendering ## What does this MR do? Initialises the timeago element when a discussion is updated or resolved. ## Screenshots (if relevant) ![Screen_Shot_2016-11-22_at_11.49.22](/uploads/02900cc4de019ac33cd4d59d586629aa/Screen_Shot_2016-11-22_at_11.49.22.png) ## What are the relevant issue numbers? Closes #24787 See merge request !7656
-
Fatih Acet authored
Fixed commit time not rendering after initial page load ## What does this MR do? Inits the timeago for commits when infinite scrolling which fixes the issue of the timeago not rendering correctly when scrolling down. ## What are the relevant issue numbers? Closes #24862 See merge request !7704
-
Fatih Acet authored
Properly escape username validation error ## What does this MR do? Prevents the double-escaping of the username validation error when attempting to change one's username using an invalid character. Go to [/profile/account](https://gitlab.com/profile/account) and attempt to add an invalid character like `@` or `#` to your username to trigger this message. ## Screenshots (if relevant) #### Before: ![user-name-change](/uploads/8e509ca8a22e40fd51c3c1919e9c6871/user-name-change.png) #### After: ![Screen_Shot_2016-11-23_at_5.23.52_PM](/uploads/3e868128724e6af07d1193494ec25941/Screen_Shot_2016-11-23_at_5.23.52_PM.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 - [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 #23813 See merge request !7725
-
Fatih Acet authored
Fixed issue boards scrolling with a lot of lists & issues ## What does this MR do? When an issue board has a lot of lists & each list has a lot of issues scrolling can be tricky. This changes that by making the element that scrolls the `board-list` div. This is ok because sorting inside each list isn't possible, it will need re-thinking when sorting is possible but this fixes the bug for now. See merge request !7748
-
Stan Hu authored
Stop supporting Google Cloud and Azure as backup strategies ## What does this MR do? It removes support for Azure and Google Cloud as backup strategies (via Fog). Motivation behind this decision can be found in !4928, !6713 but basically they require a lot of gems that are unrelated to the backup use-case. ## Are there points in the code the reviewer needs to double check? Am I missing any other location where we'd use these gems? See merge request !7739
-
Fatih Acet authored
Fixed issue boards issue sorting when dragging issue into list ## What does this MR do? Currently it just appends the new issue to the end of list & then sorts by priority which can cause some strange effects. For example if you drag the issue to the top of the list & then vue re-renders, the issue actually goes to the bottom. This changes that by adding the issue at the specific index. ## Screenshots (if relevant) ![boards-sorting](/uploads/9aa4a0cb5e0be79e7d24ab2b6abb0bbb/boards-sorting.gif) See merge request !7734
-
Phil Hughes authored
When a board has a lot of lists & issues scrolling stops the user from moving the issue to the lsat list (or any list not on screen). This changes that by making the scrollable element the board-list element. This will need re-thinking when sorting in lists is possible.
-
Fatih Acet authored
Pick valid event objects for the events list ## What does this MR do? Fixes JS error when loading events with possible `null` objects ## What are the relevant issue numbers? Closes #24836 See merge request !7689
-
Sean McGivern authored
You can only assign default_branch when editing a project Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7726 See merge request !7741
-
Robert Schilling authored
You can only assign default_branch when editing a project or when creating a project for a specified user [ci skip] You can only assign default_branch when editing a project [ci skip]
-
Kamil Trzciński authored
changes environment.last_deployment to a try expression so it does not fail if e… ## What does this MR do? Fixes the call on `environment.last_deployment` to not break when `environment`is not yet set. ## 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 #24779 See merge request !7671
-
Rémy Coutable authored
Don't convert data which already is the target type With Grape's DSL we already enforce data types. We don't need to explicitly convert to string if there is already one. See merge request !7740
-
Rémy Coutable authored
Move admin spam spinach test to RSpec See merge request !7708
-
Robert Schilling authored
-
Achilleas Pipinellis authored
Merge branch '24908-install-instructions-seem-to-have-two-database-steps-out-of-order' into 'master' Fix documentation to create the `pg_trm` extension before creating the DB Closes #24908 See merge request !7735
-
Rémy Coutable authored
The amount of gems required is quite high compared to the usefulness of the features. Related to !4928, !6713 Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
Achilleas Pipinellis authored
Add missing documentation. ## What does this MR do? Add documentation to Build events on webhooks See merge request !7717
-
tiagonbotelho authored
-
Sean McGivern authored
Add default_branch attr to Project API payload in docs. See merge request !7726
-
Robert Speicher authored
Document that we always use `do...end` for `before` in RSpec [ci skip] See merge request !7697
-
Achilleas Pipinellis authored
Add missing JIRA file that redirects to the new location See merge request !7736
-
Phil Hughes authored
-
Phil Hughes authored
Currently it just appends the new issue to the end of list & then sorts by priority which can cause some strange effects. For example if you drag the issue to the top of the list & then vue re-renders, the issue actually goes to the bottom.
-
Douwe Maan authored
-
Achilleas Pipinellis authored
[ci skip]
-
Rémy Coutable authored
[ci skip] Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
[ci skip] Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
Douwe Maan authored
Backport Note#commands_changes from EE One small thing from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/870 that was missed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7604. /cc @rdavila See merge request !7730
-
Robert Speicher authored
Log mv_namespace parameters [ci skip] See merge request !7729
-
Douwe Maan authored
-
Chris Wilson authored
-
Douwe Maan authored
Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## 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 - [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? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7459
-
Rémy Coutable authored
Move admin abuse report spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7691
-
Annabel Dunstone Gray authored
Simplify copy on "Create a new list" dropdown in Issue Boards ## What does this MR do? It changes the "Create new list" text to simply "Add list". It also describes the operation in a more concise way. It was suggested in #24659. ## Are there points in the code the reviewer needs to double check? Although I refactored references to the name of the button to reflect the new text, I left part of the documentation unmodified: File: `doc/user/project/issue_board.md` ``` In short, here's a list of actions you can take in an Issue Board: - [Create a new list](#creating-a-new-list). - [Delete an existing list](#deleting-a-list). ``` because I was not sure if changing those was necessary. Additionally, I replaced every occurrence of `click_button 'Create new list'` with `click_button 'Add list'`in the spec. I'm not sure if that causes any change in behavior as I am not sure if there are any hooks to the previous name, explicitly. File: `spec/features/boards/boards_spec.rb` ## Why was this MR needed? It is an improvement, as suggested in #24659 ## Screenshots (if relevant) **Before:** ![before](/uploads/cffd30b0e9a21d16bc25d046eb4ca42b/before.png) **After:** ![after2](/uploads/95b049e0c1c565c4ccd1a72a3f4be925/after2.png) ## 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) - [ ] 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 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? #24659 See merge request !7605
-
Rémy Coutable authored
Move abuse report spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7659
-