summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* refactor project create service41424-gitlab-rake-gitlab-import-repos-schedules-an-importJames Lopez2018-01-031-1/+1
|
* refactor code to use new import typeJames Lopez2018-01-031-0/+4
|
* Fix links to old commits in merge requests41492-mr-comment-fixJarka Kadlecová2017-12-291-2/+7
|
* Merge branch 'gitaly-remotes' into 'master'Dmitriy Zaporozhets2017-12-251-4/+0
|\ | | | | | | | | | | | | Incorporate Gitaly's RemoteService RPCs Closes gitaly#852 See merge request gitlab-org/gitlab-ce!16060
| * Remove unused method `remote_exists?`Alejandro Rodríguez2017-12-221-4/+0
| |
* | Merge branch '36782-replace-team-user-role-with-add_role-user-in-specs' into ↵Rémy Coutable2017-12-232-21/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Replace '.team << [user, role]' with 'add_role(user)' in specs" Closes #36782 See merge request gitlab-org/gitlab-ce!16069
| * | Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-222-21/+9
| |/
* | Merge branch 'dm-diff-note-for-line-performance' into 'master'Robert Speicher2017-12-224-20/+6
|\ \ | | | | | | | | | | | | | | | | | | Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison Closes #41406 See merge request gitlab-org/gitlab-ce!16111
| * | Improve performance of DiffDiscussion#truncated_diff_lines and ↵Douwe Maan2017-12-224-20/+6
| |/ | | | | | | DiffNote#diff_line by removing expensive diff position calculation and comparison
* | Merge branch 'fj-revert-event-target-author-preloading' into 'master'Stan Hu2017-12-221-1/+1
|\ \ | | | | | | | | | | | | Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788 See merge request gitlab-org/gitlab-ce!16118
| * | Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788Francisco Javier López2017-12-221-1/+1
| | |
* | | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-225-38/+64
| | |
* | | Merge branch 'dm-issue-move-transaction-error' into 'master'Robert Speicher2017-12-221-5/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Execute project hooks and services after commit when moving an issue Closes #41324 See merge request gitlab-org/gitlab-ce!16108
| * | Execute project hooks and services after commit when moving an issuedm-issue-move-transaction-errorDouwe Maan2017-12-221-5/+11
| |/
* | Use relative URLs when linking to uploaded filesNick Thomas2017-12-221-1/+1
| |
* | Merge branch 'dz-fix-seed-fu' into 'master'Douwe Maan2017-12-221-0/+1
|\ \ | |/ |/| | | | | | | | | Explictly require Gitlab::Utils in ProjectFeaturesCompatibility Closes #41390 See merge request gitlab-org/gitlab-ce!16107
| * Explictly require Gitlab::Utils in ProjectFeaturesCompatibilitydz-fix-seed-fuDmitriy Zaporozhets2017-12-221-0/+1
| | | | | | | | | | | | | | For some reason Rails does not require it automatically when invoked via rake task which cause tasks like seed_fu fail Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | LDAP extern_uids are not normalized when updated via APIFrancisco Javier López2017-12-211-0/+10
|/
* Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7Kim Carlbäcker2017-12-202-7/+11
| | | This reverts merge request !15712
* Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-191-1/+1
| | | | | | | | | Previously, this would include the entire User record in the update hash, which was rendered in the response using `to_json`, erroneously exposing every attribute of that record, including their (now removed) private token. Now we only include the user ID, and perform the lookup on-demand.
* Add a JsonSerializationError class instead of raising SecurityErrorRobert Speicher2017-12-191-2/+4
|
* Accept arguments to blocked JSON serialization methodsRobert Speicher2017-12-191-1/+1
|
* Add BlocksJsonSerialization model concern and include it in UserRobert Speicher2017-12-192-0/+15
|
* Merge branch '36020-private-npm-modules' into 'master'Douwe Maan2017-12-192-3/+28
|\ | | | | | | | | | | | | Do not generate links for private NPM modules in blob view Closes #36020 See merge request gitlab-org/gitlab-ce!16002
| * BlobViewer::PackageJson - if private link to homepageMario de la Ossa2017-12-181-3/+9
| |
| * Do not generate links for private NPM modules in blob viewMario de la Ossa2017-12-182-3/+22
| |
* | Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-193-9/+36
|\ \ | |/ |/| | | | | Improve performance of Pipelines#index.json See merge request gitlab-org/gitlab-ce!14846
| * Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-193-9/+36
| | | | | | | | | | | | | | | | | | | | Uses `list_commits_by_oid` on the CommitService, to request the needed commits for pipelines. These commits are needed to display the user that created the commit and the commit title. This includes fixes for tests failing that depended on the commit being `nil`. However, now these are batch loaded, this doesn't happen anymore and the commits are an instance of BatchLoader.
* | rework the merge_request_version_params to use Object#tapcommit-diff-discussion-in-mr-context-fix-linksMicaël Bergeron2017-12-181-8/+4
| |
* | fix the commit diff discussion sending the wrong urlMicaël Bergeron2017-12-181-5/+14
| | | | | | | | it should now send you to the merge request diff path scoped to the commit.
* | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-181-0/+6
|\ \ | |/ |/| | | | | | | | | Add button to run scheduled pipeline immediately Closes #38741 See merge request gitlab-org/gitlab-ce!15700
| * Avoid Gitaly N+1 calls by caching tag_namesStan Hu2017-12-121-0/+6
| |
* | Fixes 40842 - Adds extra cookies to JIRA service requestsStanislaw Wozniak2017-12-181-0/+2
| |
* | Fix job count in pipeline success mailChristiaan Van den Poel2017-12-181-0/+4
| |
* | Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-1510-40/+49
|\ \ | | | | | | | | | | | | Add cop to make sure we don't use ivar in a module See merge request gitlab-org/gitlab-ce!12800
| * \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-1543-216/+750
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (671 commits) Make rubocop happy Use guard clause Improve language Prettify Use temp branch Pass info about who started the job and which job triggered it Docs: add indexes for monitoring and performance monitoring clearer-documentation-on-inline-diffs Add docs for commit diff discussion in merge requests sorting for tags api Clear BatchLoader after each spec to prevent holding onto records longer than necessary Include project in BatchLoader key to prevent returning blobs for the wrong project moved lfs_blob_ids method into ExtractsPath module Converted JS modules into exported modules spec fixes Bump gitlab-shell version to 5.10.3 Clear caches before updating MR diffs Use new Ruby version 2.4 in GitLab QA images moved lfs blob fetch from extractspath file Update GitLab QA dependencies ...
| * \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-3029-262/+293
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (170 commits) support ordering of project notes in notes api Redirect to an already forked project if it exists Reschedule the migration to populate fork networks Create fork networks for forks for which the source was deleted. Fix item name and namespace text overflow in Projects dropdown Minor backport from EE fix link that was linking to `html` instead of `md` Backport epic tasklist Add timeouts for Gitaly calls SSHUploadPack over Gitaly is now OptOut fix icon colors in commit list Fix star icon color/stroke Backport border inline edit Add checkboxes to automatically run AutoDevops pipeline BE for automatic pipeline when enabling Auto DevOps I am certainly weary of debugging sidekiq but I don't think that's what was meant Ensure MRs always use branch refs for comparison Fix issue comment submit button disabled on GFM paste Lock seed-fu at the correct version in Gemfile.lock Improve indexes on merge_request_diffs ...
| * | | | Fix a few layout errorLin Jen-Shin2017-11-221-0/+1
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-2223-55/+241
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (126 commits) Update VERSION to 10.3.0-pre Update CHANGELOG.md for 10.2.0 default fill color for SVGs ignore hashed repos (for now) when using `rake gitlab:cleanup:repos` Use Redis cache for branch existence checks Update CONTRIBUTING.md: Link definition of done to criteria Use `make install` for Gitaly setups in non-test environments FileUploader should check for hashed_storage?(:attachments) to use disk_path Set the default gitlab-shell timeout to 3 hours Update composite pipelines index to include "id" Use arrays in Pipeline#latest_builds_with_artifacts Fix blank states using old css Skip confirmation user api Custom issue tracker Revert "check for `read_only?` first before seeing if request is disallowed" add `#with_metadata` scope to remove a N+1 from the notes' API Fix promoting milestone updating all issuables without milestone Batchload blobs for diff generation check for `read_only?` first before seeing if request is disallowed use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers` ...
| * | | | | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-226-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And use .rubocop.yml to exclude paths we don't care, rather than using the cop itself to exclude.
| * | | | | Updates based on feedbackLin Jen-Shin2017-11-221-4/+1
| | | | | |
| * | | | | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-188-34/+33
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-1733-213/+643
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (507 commits) Add dropdowns documentation Convert migration to populate latest merge request ID into a background migration Set 0.69.0 instead of latest for codeclimate image De-duplicate background migration matchers defined in spec/support/migrations_helpers.rb Update database_debugging.md Update database_debugging.md Move installation of apps higher Change to Google Kubernetes Cluster and add internal links Add Ingress description from official docs Add info on creating your own k8s cluster from the cluster page Add info about the installed apps in the Cluster docs Resolve "lock/confidential issuable sidebar custom svg icons iteration" Update HA README.md to clarify GitLab support does not troubleshoot DRBD. Update license_finder to 3.1.1 Make sure NotesActions#noteable returns a Noteable in the update action Cache the number of user SSH keys Adjust openid_connect_spec to use `raise_error` Resolve "Clicking on GPG verification badge jumps to top of the page" Add changelog for container repository path update Update container repository path reference ...
| * | | | | | WIPLin Jen-Shin2017-11-061-13/+5
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-0670-354/+1275
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1723 commits) Resolve "Editor icons" Refactor issuable destroy action Ignore routes matching legacy_*_redirect in route specs Gitlab::Git::RevList and LfsChanges use lazy popen Gitlab::Git::Popen can lazily hand output to a block Merge branch 'master-i18n' into 'master' Remove unique validation from external_url in Environment Expose `duration` in Job API entity Add TimeCop freeze for DST and Regular time Harcode project visibility update a changelog Put a condition to old migration that adds fast_forward column to MRs Expose project visibility as CI variable fix flaky tests by removing unneeded clicks and focus actions fix flaky test in gfm_autocomplete_spec.rb Use Gitlab::Git operations for repository mirroring Encapsulate git operations for mirroring in Gitlab::Git Create a Wiki Repository's raw_repository properly Add `Gitlab::Git::Repository#fetch` command Fix Gitlab::Metrics::System#real_time and #monotonic_time doc ...
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-2514-105/+55
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (168 commits) Update CHANGELOG.md for 10.0.1 Remove Grit settings from default settings Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration Workaround for #38259 Workaround for n+1 in Projects::TreeController#show Removed old icons from project page Make branches page translatable fix typo in icons section Don't show it if there's no project. Update CHANGELOG.md for 10.0.0 Inform user that current shared projects will remain shared Allow the git circuit breaker to correctly handle missing repository storages Reserve refs/replace cos `git-replace` is using it Resolve "Better SVG Usage in the Frontend" Replace the 'project/service.feature' spinach test with an rspec analog Replace the 'project/shortcuts.feature' spinach test with an rspec analog Removed two legacy config options Fix rendering double note issue. IssueNotes: Switch back to Write pane when note cancel or submit. Upgrade Nokogiri because of CVE-2017-9050 ...
| * | | | | | | | Allow simple ivar ||= form. Update accordinglyLin Jen-Shin2017-09-1912-19/+25
| | | | | | | | |
| * | | | | | | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-1814-2/+17
| | | | | | | | |
* | | | | | | | | Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-153-5/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure user email is read only when synced with LDAP Closes #41033 See merge request gitlab-org/gitlab-ce!15915
| * | | | | | | | Make sure user email is read only when synced with LDAPDouwe Maan2017-12-153-5/+11
| | | | | | | | |