summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-203-0/+76
|\
| * Fix the filesystem shard health check to check all configured shardsNick Thomas2017-09-191-0/+1
| |
| * Merge branch 'zj-update-project-settings' into 'master'Grzegorz Bizon2017-09-191-0/+43
| |\ | | | | | | | | | | | | | | | | | | Allow updating of project auto devops settings Closes #37893 See merge request gitlab-org/gitlab-ce!14291
| | * Fix instance default option being true as valueZeger-Jan van de Weg2017-09-181-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | When a user selected 'Instance default' as value for the auto devops settings, this was interpreted as a true value. Now we post an empty string in this case, meaning we want to set `NULL` in the database. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37893#note_40541294
| | * Allow updating of project auto devops settingsZeger-Jan van de Weg2017-09-151-0/+31
| | | | | | | | | | | | | | | | | | | | | Updating didn't work, as the project_id was missing to be set for the project_auto_devops model. Fixes gitlab-org/gitlab-ce#37893
| * | Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-jsonStan Hu2017-09-181-0/+32
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | In #37955,we see that the profile had a number of N+1 queries from repeated access to `cross_reference_not_visible_for?`. This was optimized in previous versions of GitLab by rendering all notes at once, counting the number of visible references, and then using that number to check whether a system note should be fully redacted. There was also another N+1 query calling `ProjectTeam#member?`, which did not take advantage of an optimization in prepare_notes_for_rendering that would preload the maximum access level per project. Closes #37955
* | Create system notes for MR too, improve doc + clean up codeJarka Kadlecova2017-09-141-0/+9
| |
* | Check the discussion lock only for issuables & clean styleJarka Kadlecova2017-09-141-2/+2
| |
* | Support discussion locking in the backendJarka Kadlecova2017-09-141-0/+41
|/
* Merge branch '34510-board-issues-sql-speedup' into 'master'Douwe Maan2017-09-141-0/+11
|\ | | | | | | | | | | | | fix #34510 add association preloading for issue boards Closes #34510 See merge request gitlab-org/gitlab-ce!14198
| * fix another N+1 query for label priorities34510-board-issues-sql-speedupmicael.bergeron2017-09-121-0/+11
| | | | | | | | added a QueryRecorder for IssuesController#index.json
* | Merge branch 'revert-2f46c3a8' into 'master'Robert Speicher2017-09-121-2/+4
|\ \ | |/ |/| | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'" See merge request !14190
| * Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-2/+4
| | | | | | This reverts merge request !14148
* | Resolve "Error 500 in non-UTF8 branch names"Micael Bergeron2017-09-121-0/+15
|/
* Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-081-4/+2
| | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-falseRuben Davila2017-09-071-0/+124
|
* Merge branch ↵Sean McGivern2017-09-071-2/+4
|\ | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
| * Restore some changes from !9199Rubén Dávila2017-09-061-2/+4
| |
* | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-072-10/+24
|\ \ | |/ |/| | | | | Group boards CE backport See merge request !13883
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-09-0611-147/+352
| |\ | | | | | | | | | ee_issue_928_backport
| * | Backport specsFelipe Artur2017-08-312-10/+24
| | |
| * | Continue BE backportFelipe Artur2017-08-312-0/+0
| | |
* | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-061-0/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | First time contributor badge Closes #35161 See merge request !13902
| * | | add controller specmicael.bergeron2017-09-061-0/+22
| | |/ | |/| | | | | | | also fix some code styling issues
* | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-061-8/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for downloading a single job artifact Closes #37196 See merge request !14027
| * \ \ Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into ↵Grzegorz Bizon2017-09-061-0/+82
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits)
| * | | Fix artifacts controller specsGrzegorz Bizon2017-09-061-8/+0
| | | |
* | | | Profile updates from providersAlexander Keramidas2017-09-061-1/+24
| |/ / |/| |
* | | Re-use issue/MR counts for the pagination systemmr-index-page-performanceYorick Peterse2017-09-051-0/+82
|/ / | | | | | | | | | | | | This changes the issue and MR index pages so the pagination system re-uses the output of the COUNT(*) query used to calculate the number of rows per state (opened, closed, etc). This removes the need for an additional COUNT(*) on both pages.
* | Move "Move to different project" to sidebar34261-move-move-to-sidebarEric Eastwood2017-09-032-117/+120
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261
* | Merge branch 'issue-discussions-refactor' into 'master'Jacob Schatz2017-09-022-5/+27
|\ \ | | | | | | | | | | | | Issue discussions Vue refactor See merge request !12069
| * \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-312-13/+32
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb
| * | | Fix specsDouwe Maan2017-08-301-5/+12
| | | |
| * | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-305-8/+63
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb
| * \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-231-10/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json
| * \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-173-8/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb
| * | | | | | fix static_analysis (rubocop)Jarka Kadlecova2017-08-141-2/+1
| | | | | | |
| * | | | | | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-125-81/+190
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (66 commits) fix confidential border issue as well as confidential styles leaking on new MR Migrate force push check to Gitaly Add option to disable project export on instance Better categorize test coverage results Add option to disable project export on instance - db changes Better caching and indexing of broadcast messages Include the `is_admin` field in the `GET /users/:id` API when current user is an admin Document rspec-retry and rspec-flaky Fix cop description Retrieve and sync flaky specs report from and to S3 Use a new RspecFlakyListener to detect flaky specs Fix formatting of patch_versions.md [skip ci] Enable Timecop safe mode Show error message for API 500 error in tests, and Fix merge request diff deserialisation when too_large was absent Delete correct key from `session` after authenticating using U2F Bumps omniauth-ldap gem version to 2.0.4 Pending delete projects no longer return 500 error in Admins projects view Do not run the `ee_compat_check` job for stableish branches Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb. ...
| * | | | | | | Use UserNoteEntity instead of UserEntity for notesJarka Kadlecova2017-08-111-0/+16
| | | | | | | |
* | | | | | | | Merge branch '37202-revert-changes-to-signing-enabled' into 'master'Douwe Maan2017-09-012-6/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rollback changes made to signing_enabled. Closes #37202 See merge request !13956
| * | | | | | | | Rollsback changes made to signing_enabled.Tiago Botelho2017-09-012-6/+15
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch ↵Tim Zallmann2017-08-311-0/+32
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-public' into 'master' Resolve various visibility level settings issues Closes #31273 See merge request !13442
| * | | | | | | Add check for access to NamespaceRubén Dávila2017-08-301-0/+32
| |/ / / / / /
* | | | | | | Merge branch 'zj-disable-pages-in-subgroups' into 'master'Grzegorz Bizon2017-08-311-1/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show references to Pages when not available Closes #34864 See merge request !13888
| * | | | | | | Don't show references to Pages when not availableZeger-Jan van de Weg2017-08-311-1/+12
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this instance its subgroups, and given we can't deploy it, we shouldn't allow it to be shown. Fixes gitlab-org/gitlab-ce#34864
* | | | | | | Merge branch '28938-password-change-workflow-for-admins' into 'master'Sean McGivern2017-08-311-12/+20
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the password change workflow for admins. Closes #28938 See merge request !13901
| * | | | | | Changes the password change workflow for admins.28938-password-change-workflow-for-adminsTiago Botelho2017-08-311-12/+20
| | |/ / / / | |/| | | |
* | | | | | Add filter by my reactionHiroyuki Sato2017-08-301-0/+38
| | | | | |
* | | | | | replace `is_spam?` with `spam?`Maxim Rydkin2017-08-293-8/+8
| |/ / / / |/| | | |
* | | | | Merge branch 'sh-add-spec-to-protected-tags-deletion' into 'master'Robert Speicher2017-08-281-0/+17
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add spec for deleting protected tags See merge request !13693
View Lorry Controller Status