summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-101-1/+1
| | | | | In this case comparing old_path and new_path is not enough because there are two entires that match.
* Merge branch 'unauthenticated-container-registry-access' into 'security'Alejandro Rodriguez2016-11-091-2/+2
| | | | | | | | | | Restore unauthenticated access to public container registries Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24284 See merge request !2025 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '23403-fix-events-for-private-project-features' into 'security'Robert Speicher2016-11-091-2/+1
| | | | | | | | | | | | Respect project visibility settings in the contributions calendar This MR fixes a number of bugs relating to access controls and date selection of events for the contributions calendar Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23403 See merge request !2019 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'fix-unathorized-cloning' into 'security'Douwe Maan2016-11-092-9/+5
| | | | | | | | | | Ensure external users are not able to clone disabled repositories. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23788 See merge request !2017 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'rs-project_params' into 'master' Rémy Coutable2016-11-081-17/+35
|\ | | | | | | | | Apply `*_params_ce` pattern to ProjectsController See merge request !7338
| * Apply `*_params_ce` pattern to ProjectsControllerrs-project_paramsRobert Speicher2016-11-071-17/+35
| |
* | Merge branch '24255-search-fix' into 'master' Rémy Coutable2016-11-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken commits search ## What does this MR do? Fixes commits search ## What are the relevant issue numbers? Closes #24255 See merge request !7339
| * | Fix broken commits search24255-search-fixValery Sizov2016-11-081-1/+1
| |/
* | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-082-1/+16
|\ \ | | | | | | | | | | | | Use separate email-friendly token for incoming email See merge request !5914
| * | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-072-2/+9
| | | | | | | | | | | | reactivates all tests and writes more tests for it
| * | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-1/+9
| | | | | | | | | | | | email token be reset
* | | Merge branch 'dz-fix-project-index' into 'master' Sean McGivern2016-11-081-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Fix project index page See merge request !7331
| * | | Fix project indexDmitriy Zaporozhets2016-11-071-3/+3
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' ↵Sean McGivern2016-11-081-1/+13
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | into 'master' Network page appear with an error message when entering nonexistent git revision Closes #2362 See merge request !7172
| * | Refactor method nameHiroyuki Sato2016-11-081-2/+2
| | |
| * | Fix bug of json request urlHiroyuki Sato2016-11-071-3/+10
| | |
| * | Remove 'extended_sha1' option from ExtractsPath moduleHiroyuki Sato2016-11-061-0/+1
| | |
| * | Separete a very long lineHiroyuki Sato2016-11-061-1/+3
| | |
| * | Network page appear with an error message when entering nonexistent git revisionHiroyuki Sato2016-11-061-1/+3
| |/
* | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master' Douwe Maan2016-11-071-0/+5
|\ \ | |/ |/| | | | | | | | | | | | | Use more than one kind of Git garbage collection Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6588 by @jacobvosmaer to get the builds to pass :) Closes #22729 See merge request !7321
| * Refine Git garbage collectionJacob Vosmaer2016-11-041-0/+5
| |
* | Merge branch 'show-status-from-branch' into 'master' Rémy Coutable2016-11-043-4/+22
|\ \ | | | | | | | | | | | | | | | | | | Show pipeline status from branch and commit than only commit Closes #23615 See merge request !7034
| * \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-043-3/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-028-17/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (126 commits) Allow to search for user by secondary email address in the admin interface Rename :name search parameter to :search_query at /admin/users Fix project features default values Add a link to the Issue Boards API in main README Fix Markdown styling inside reference links Fix relative links in Markdown wiki when displayed in "Project" tab Flexbox webkit prefixes Tests update Tests update Changed where merge request link is New todos blank state Implement CreateMembers service to make controller thin Do not show tooltip for active element (!7105) Update CHANGELOG Assign local_assigns[:subject] to a variable on the shared label partial Use select instead of pluck on Project.group_ids Skip authorization check when searching for labels on IssuableFinder Use label subject to calculate number of issues/mrs within the group Remove unnecessary includes(:priorities) on Projects::LabelsController Add 8.13.2 CHANGELOG entries ...
| * \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-261-3/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (65 commits) Fixed typo in css class Merge branch 'airat/gitlab-ce-23268-fix-milestones-filtering' into 'master' Escape quotes in gl_dropdown values to prevent exceptions Fixes various errors when adding deploy keys caused by not exiting the control flow. Fix typo on /help/ui to Alerts section Grapify tags API Add 8.13.1 CHANGELOG entries Fix sidekiq stats in admin area Remove use of wait_for_ajax since jQuery was removed Specify which Fog storage drivers are imported by default in backup_restore.md Moved avatar infront of labels Don't schedule ProjectCacheWorker unless needed Fixed height of sidebar causing scrolling issues Reduce overhead of LabelFinder by avoiding #presence call Fixed users profile link in sidebar Fixed new labels not being created Improve redis config tasks for migration paths job Ensure search val is defined. Ensure cursor is applied to end of issues search input. Increase debounce wait on issues search execution. Keep the new resque.yml aside and use it once we've checked out master ...
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-253-3/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (67 commits) Stop unauthized users dragging on issue boards Capitalize Git Add docker-compose environment initialization command Improve readability and add specs for label filtering Improve label filtering implementation Allow the use of params[:name] when filtering labels Fix Rubocop offenses in issue move specs Add spec in Issues::MoveService to fix label assignment regression Fix bug where labels would be assigned to issues that were moved Fix `User#to_reference` Fix rubocop build error Remove redundant class_name and foreign_key overrides Enable SingleLinePerSelector in scss-lint Escape ref and path for relative links (!6050) Add failing test for #21420 Enable SpaceAfterVariableColon in scss-lint Enable SpaceAroundOperator in scss-lint Enable trailingWhitespace in scss-lint Disable Rails/Output cop since it makes no sense here Use File.write instead of File.open + File#write ...
| * | | | | | Pass `@ref` along so we know which pipeline to showLin Jen-Shin2016-10-243-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23615
* | | | | | | Merge branch 'rs-merge_request_params' into 'master' Robert Speicher2016-11-041-6/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply `*_params_ce + *_params_ee` pattern to MergeRequestsController See merge request !7263
| * | | | | | | Apply `*_params_ce + *_params_ee` pattern to MergeRequestsControllerRobert Speicher2016-11-041-6/+21
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' Douwe Maan2016-11-041-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ![only_allow_merge_if_all_discussions_are_resolved](/uploads/9388db9421da0214590ffab6fb29f985/only_allow_merge_if_all_discussions_are_resolved.png) ![only_allow_merge_if_all_discussions_are_resolved_msg](/uploads/b1bba0c72ad67d3a1b34718baa08526e/only_allow_merge_if_all_discussions_are_resolved_msg.png) ## 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
| * | | | | | Complete and improve specsRémy Coutable2016-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Add setting to only allow merge requests to be merged when all discussions ↵Rodolfo Santos2016-11-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are resolved Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '22588-todos-filter-shows-all-users' into 'master' Sean McGivern2016-11-041-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Todos Filter Shows All Users Closes #22588 See merge request !7258
| * | | | | | Fix: Todos Filter Shows All Users22588-todos-filter-shows-all-usersValery Sizov2016-11-041-1/+5
| |/ / / / /
* | | | | | Only skip group when it's actually a group in the "Share with group" select23961-can-t-share-project-with-groupsRémy Coutable2016-11-041-1/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Allow multiple repository storage shards to be enabled, and automatically ↵Nick Thomas2016-11-041-1/+1
| |_|_|/ |/| | | | | | | | | | | round-robin between them
* | | | Merge branch 'Allow-admin-to-search-for-user-by-secondary-email-address' ↵Sean McGivern2016-11-011-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Allow admin to search for user by secondary email address Closes #23761 See merge request !7115
| * | | | Allow to search for user by secondary email address in the admin interfaceYar2016-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not possible to search for a user by his secondary email address in the Users search bar in the admin interface(/admin/users). A use-case could be that an admin wants to remove a specific secondary email address of an user, because it interferes with another user. Issue #23761 This commit adds ability to search not only by main email, but also by any secondary email in the admin interface.
| * | | | Rename :name search parameter to :search_query at /admin/usersYar2016-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parameter is used to search users by several criretia was called :name. This request renames it to :search_query which closer to it actual perpose
* | | | | Merge branch 'adam-fix-wiki-links-markdown' into 'master' Sean McGivern2016-11-011-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix relative links in Markdown wiki when displayed in "Project" tab Refers to #23806 See merge request !7218
| * | | | | Fix relative links in Markdown wiki when displayed in "Project" tabadam-fix-wiki-links-markdownAdam Niedzielski2016-11-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Refers to #23806.
* | | | | | Merge branch 'refactor_group_members' into 'master' Sean McGivern2016-11-011-10/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement CreateProjectMembers service to make controller thin Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23566 See merge request !7170
| * | | | | Implement CreateMembers service to make controller thinrefactor_group_membersValery Sizov2016-11-011-10/+7
| |/ / / /
* | | | | Remove unnecessary includes(:priorities) on Projects::LabelsControllerDouglas Barbosa Alexandre2016-10-311-1/+1
|/ / / /
* | | | Merge branch '22271-drone-tag-pipeline-build' into 'master' Douwe Maan2016-10-311-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix lightweight tags not processed correctly by GitTagPushService ## What does this MR do? Fix lightweight tags not processed correctly by GitTagPushService ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Lightweight tags were being processed incorrectly, causing tag triggers to receive wrong information and not function properly. ## Does this MR meet the acceptance criteria? - [ ] [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 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 #22271 See merge request !6532
| * | | | Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we updated gitlab_git to 10.4.1, `tag.target` changed from pointing to the sha of the tag to the sha of the commit the tag points to. The problem is that only annotated tags have `object_sha`s, lightweight tags don't (it's nil), so (only) in their case we still need to use `tag.target`.
* | | | | Merge branch '22392-add-x-of-y-tasks-completed-on-issuable' into 'master' Sean McGivern2016-10-282-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | add "x of y tasks completed" on issuable Closes #22392 See merge request !6527
| * | | | add "x of y tasks completed" on issuableGuilherme Salazar2016-10-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix issues pointed out in !6527 add task completion status feature to CHANGELOG
* | | | | Fixed boards store specissue-board-welcome-cookie-monsterPhil Hughes2016-10-281-2/+1
| | | | |
* | | | | Delete issue board welcome cookie when project is newPhil Hughes2016-10-281-1/+4
|/ / / /