summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Fix dashboard labels dropdownNick Thomas2017-07-071-1/+1
|
* Merge branch 'dm-readme-auxiliary-blob-viewer-without-wiki' into 'master'Sean McGivern2017-07-072-0/+10
|\ | | | | | | | | | | | | Don't show auxiliary blob viewer for README when there is no wiki Closes #34732 See merge request !12689
| * Don't show auxiliary blob viewer for README when there is no wikidm-readme-auxiliary-blob-viewer-without-wikiDouwe Maan2017-07-062-0/+10
| |
* | Add table for merge request commitsSean McGivern2017-07-065-72/+79
| | | | | | | | | | | | | | | | | | | | | | This is an ID-less table with just three columns: an association to the merge request diff the commit belongs to, the relative order of the commit within the merge request diff, and the commit SHA itself. Previously we stored much more information about the commits, so that we could display them even when they were deleted from the repo. Since 8.0, we ensure that those commits are kept around for as long as the target repo itself is, so we don't need to duplicate that data in the database.
* | Merge branch 'backport_slack_application_changes' into 'master'Sean McGivern2017-07-061-0/+8
|\ \ | |/ |/| | | | | Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2259 See merge request !12653
| * Backport Service changes from ↵backport_slack_application_changesValery Sizov2017-07-051-0/+8
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2259
* | Merge branch '34716-environment-specific-variables-ce' into 'master'Douwe Maan2017-07-062-8/+16
|\ \ | | | | | | | | | | | | | | | | | | Backports for ee-2112 Closes #34716 See merge request !12671
| * | Backports for ee-2112Lin Jen-Shin2017-07-062-8/+16
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
* | | Merge branch '33360-generate-kubeconfig' into 'master'Kamil Trzciński2017-07-061-1/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Generate KUBECONFIG in KubernetesService#predefined_variables Closes #33360 See merge request !12223
| * | | Rename KUBECONFIG_FILE to KUBECONFIGLin Jen-Shin2017-07-061-1/+1
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into 33360-generate-kubeconfigLin Jen-Shin2017-07-0656-457/+660
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (888 commits) Fix Rubocop offense Use a previous approach for cycle analytics dummy pipeline Allow admin to disable all restricted visibility levels Removes file_name_regex from Gitlab::Regex Remove IIFEs around several javascript classes Update CHANGELOG.md for 9.3.5 Add ProjectPathHelper cop Create and use project path helpers that only need a project, no namespace Handles realtime with 2 states for environments table Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'" Allow creation of files and directories with spaces in web UI Disable Flipper memoizer in tests to avoid transient failures Introduce cache policies for CI jobs fix sidebar padding for full-width items (Time Tracking help) Replace 'snippets/snippets.feature' spinach with rspec Rename ci_config_file to ci_config_path Add back Pipeline#ci_yaml_file_path due to all the troubles Revert change to design. Go back to scrollable page Fix cycle analytics tests by making pipeline valid Fixes the column widths for the new navigation options in settings ...
| * | | Changelog entry, doc, and only pass KUBECONFIG_FILELin Jen-Shin2017-06-161-2/+1
| | | |
| * | | Generate KUBECONFIG in KubernetesService#predefined_variablesLin Jen-Shin2017-06-161-1/+13
| | | |
* | | | Merge branch 'foreign-keys-for-project-model' into 'master'Sean McGivern2017-07-0639-164/+190
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add foreign keys to various tables that point to the "projects" table See merge request !9388
| * | | | Rename ActiverecordSerialize copYorick Peterse2017-07-0615-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | This cop has been renamed to ActiveRecordSerialize to match the way "ActiveRecord" is usually written.
| * | | | Added Cop to blacklist the use of `dependent:`Yorick Peterse2017-07-0626-73/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is allowed for existing instances so we don't end up 76 offenses right away, but for new code one should _only_ use this if they _have_ to remove non database data. Even then it's usually better to do this in a service class as this gives you more control over how to remove the data (e.g. in bulk).
| * | | | Add many foreign keys to the projects tableYorick Peterse2017-07-063-68/+87
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for relying on Rails' "dependent" option for data removal, which is _incredibly_ slow (even when using :delete_all) when deleting large amounts of data. This also ensures data consistency is enforced on DB level and not on application level (something Rails is really bad at). This commit also includes various migrations to add foreign keys to tables that eventually point to "projects" to ensure no rows get orphaned upon removing a project.
* | | | Merge branch '34698-fix-stubbing-cached-markdown-fields' into 'master'Rémy Coutable2017-07-061-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix stubbing attributes alongside cache_markdown_field Closes #34698 See merge request !12661
| * | | Fix stubbing attributes alongside cache_markdown_fieldNick Thomas2017-07-051-1/+1
| | |/ | |/|
* | | Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'Grzegorz Bizon2017-07-063-6/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project option to allow customizing CI/CD config path" Closes #32815 and #33130 See merge request !12509
| * \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-07-058-21/+72
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32815--Add-Custom-CI-Config-Path * upstream/master: (149 commits) Revert change to design. Go back to scrollable page Fixes the column widths for the new navigation options in settings Migrate #submodule_url_for to Gitaly Add test example for external commit status retries Fix invalid Rails.logger call in lib/gitlab/health_checks/fs_shards_check.rb Fix build for !12300. Log rescued exceptions to Sentry Fix issues with non-UTF8 filenames by always fixing the encoding of tree and blob paths Revert "Merge branch 'revert-12499' into 'master'" Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion Improve the overall UX for the new monitoring dashboard Document that GitLab 9.3 requires the TRIGGER permission on MySQL Instrument Unicorn with Ruby exporter Remove group modal like remove project modal. Closes #33130 Update prometheus client gem Enables the option in user preferences to turn on the new navigation Add Jasmine tests for `OAuthRememberMe` Simplify authentication logic in the v4 users API for !12445. Use stub_application_setting when testing ApplicationHelper#support_url wait_for_requests is not needed when AJAX is not in play ...
| * | | Rename ci_config_file to ci_config_pathLin Jen-Shin2017-07-052-5/+5
| | | |
| * | | Add back Pipeline#ci_yaml_file_path due to all the troublesLin Jen-Shin2017-07-053-13/+13
| | | |
| * | | Fix config pathLin Jen-Shin2017-07-041-1/+1
| | | |
| * | | Also remove null characterLin Jen-Shin2017-07-041-1/+1
| | | |
| * | | Follow feedback on the merge requestLin Jen-Shin2017-07-043-14/+14
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-07-035-10/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32815--Add-Custom-CI-Config-Path * upstream/master: (39 commits) Fix rubocop offenses Make entrypoint and command keys to be array of strings Add issuable-list class to shared mr/issue lists to fix new responsive layout New navigation breadcrumbs Restore timeago translations in renderTimeago. Automatically hide sidebar on smaller screens Fix typo in IssuesFinder comment Remove placeholder note when award emoji slash command is applied Make setSidebarHeight more efficient with SidebarHeightManager. Update CHANGELOG.md for 9.3.3 Resolve "More actions dropdown hidden by end of diff" Use Gitaly 0.14.0 Improve support for external issue references Make issuables_count_for_state public Only verifies top position after the request has finished to account for errors Clarify counter caching for users without project access Make finders responsible for counter cache keys Add changelog entry for issue / MR tab counting optimisations Don't count any confidential issues for non-project-members Cache total issue / MR counts for project by user type ...
| * | | | Introduce CI_CONFIG_PATHLin Jen-Shin2017-06-301-1/+2
| | | | |
| * | | | Update wordings, allow only full path, add testsLin Jen-Shin2017-06-302-12/+11
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-06-3014-107/+132
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32815--Add-Custom-CI-Config-Path * upstream/master: (123 commits) Backport changes to Projects::IssuesController and the search bar bugfix: use `require_dependency` to bring in DeclarativePolicy Resolve "Select branch dropdown is too close to branch name" Clean up issuable lists Defer project destroys within a namespace in Groups::DestroyService#async_execute Fixed new navgiation bar logo height in Safari Resolve "Issue dropdown persists when adding issue number to issue description" Move verification to block level instead of paragraph Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'" Added code for defining SHA attributes Minor edits Job details won't scroll horizontally to show long lines Run mysql tests on stable preperation branches like 9-3-stable-patch-2 Bring back branches badge to main project page optimize translation content based on comments supplement traditional chinese in taiwan translation Inserts exact matches of username, email and name to the top of the user search list Remove Namespace model default scope override and write additional test to Project search optimize translation content based on comments Limit OpenGraph image size to 64x64 ...
| * | | | | Fix the test and implement missing updateLin Jen-Shin2017-06-281-0/+2
| | | | | |
| * | | | | Inline what it was before for the regexp and messageLin Jen-Shin2017-06-281-2/+2
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into ↵15041-Add-Custom-CI-Config-PathLin Jen-Shin2017-06-28268-4387/+10268
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15041-Add-Custom-CI-Config-Path * upstream/master: (12506 commits) Update CHANGELOG.md for 9.3.2 Update architecture.md Fix changelog entry file extension Fix head pipeline stored in merge request for external pipelines updated gitlab-ci.yml to compile locale Ignore JSON files generated from PO files Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses method that is no longer part of Ruby API Disable rainbow during SimpleExecutor specs to have consistence Slightly refactor pipeline schedules form in preparation for additions Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page" Make the SimpleExecutor rescue exceptions in the executing Checks Resolve "Unable to access edit comment from dropdown menu in certain screen sizes" Update changelog item revert removal of requestAnimationFrame and move to a separate MR/discussion rename getEmojiCategoryMap and remove unnecessary parameter Action Buttons on Prio Labels working again by setting pointer events to none on… Remove 'contains' option from Commit.find_all Remove Gitlab::Git::Repository#find_all Use latest chrome and chrome driver in GitLab QA Polish sidebar toggle ...
| * | | | | | Add config option to project to allow custom .gitlab-ci.yml locationKeith Pope2016-10-082-1/+22
| | | | | | |
* | | | | | | Merge branch '32408-allow-creation-of-files-and-dirs-with-spaces-in-web-ui' ↵Douwe Maan2017-07-051-3/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Make filename and path creation compatible with UNIX in web UI Closes #21362 See merge request !12608
| * | | | | | | Removes file_name_regex from Gitlab::Regex32408-allow-creation-of-files-and-dirs-with-spaces-in-web-uiTiago Botelho2017-07-051-3/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-058-21/+15
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'revert-2c879643' into 'master'Sean McGivern2017-07-042-3/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'revert-12499' into 'master'" See merge request !12633
| * | | | | | Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643Douwe Maan2017-07-042-3/+26
| | | | | | | | | | | | | | | | | | | | | This reverts merge request !12557
* | | | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master'Rémy Coutable2017-07-041-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Closes #32035 See merge request !11218
| * | | | | | chaining the methods in ref_slugStefan Hanreich2017-06-241-3/+4
| | | | | | |
| * | | | | | using bang method for gsubStefan Hanreich2017-06-181-2/+2
| | | | | | |
| * | | | | | updated regex to use beginning / ending of string metacharactersStefan Hanreich2017-06-181-1/+1
| | | | | | |
| * | | | | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Fixes #32035Stefan Hanreich2017-06-181-1/+3
| | | | | | |
* | | | | | | Merge branch 'tc-namespace-license-checks--multiple-assignees' into 'master'Douwe Maan2017-07-042-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE counterpart of: Namespace license checks for multiple assignees See merge request !11825
| * | | | | | | Make MergeRequest respond to assignee_ids & assignee_ids=Toon Claes2017-06-202-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it simpler to assign users to an Issuable, make MergeRequest support the attribute `assignee_ids`.
| * | | | | | | Backport issuable for assignee slash commands from EEToon Claes2017-06-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid conflicts when merge CE to EE by backporting code from EE. Instead of checking in `SlashCommands::InterpretService` what the issuable the type of the issuable is, ask the issuable if it is capable to do those thing and implement it in the issuable itself. The issuable will check if it's possible and if the licensed feature is available. This should also make it easier to ever add multiple assignees to MergeRequests.
* | | | | | | | Don't resolve fork relationships for projects pending deleteNick Thomas2017-07-041-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'sh-allow-force-repo-create' into 'master'Sean McGivern2017-07-031-10/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Project#ensure_repository force create a repo Closes gitlab-ee#2800 See merge request !12580
| * | | | | | | | Change the force flag to a keyword argumentsh-allow-force-repo-createDouglas Barbosa Alexandre2017-07-031-2/+2
| | | | | | | | |