summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Expire related caches after changing HEADpmq20/gitlab-ce-psvr/head/cacheMinqi Pan2017-01-152-1/+6
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Use string for class_name option for lazy autoload classSemyon Pupkov2017-01-152-3/+3
| | | | | Passing constant into this option is deprecated in Rails 5.2 https://github.com/rails/rails/commit/8312a0d22212798864f142b5a94805e0baa6c562
* Merge branch 'bug/project-feature-compatibility' into 'master' Douwe Maan2017-01-141-1/+1
|\ | | | | | | | | | | | | Mutate the attribute instead of issuing a write operation to the DB in `ProjectFeaturesCompatibility` concern. Closes gitlab-ee#1520 See merge request !8552
| * Mutate the attribute instead of issuing a write operation to the DBbug/project-feature-compatibilityGabriel Mazetto2017-01-121-1/+1
| | | | | | | | This fixes gitlab-org/gitlab-ee#1520
* | Merge branch 'fix-build-sort-order' into 'master' Robert Speicher2017-01-131-0/+6
|\ \ | |/ |/| | | | | | | | | Resolve "Sort order for pipeline build lists doesn't properly handle numbers" Closes #25428 See merge request !8277
| * rename sort methodMike Greiling2017-01-021-1/+1
| |
| * add natural sorting token for build namesMike Greiling2017-01-021-0/+6
| |
* | Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'Robert Speicher2017-01-127-159/+143
| | | | | | | | | | | | Use ReactiveCaching to update external CI status asynchronously See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2055
* | Merge branch 'use-configured-git' into 'master' Douwe Maan2017-01-121-1/+1
|\ \ | | | | | | | | | | | | Use configured git rather thans system git See merge request !8460
| * | Use configured git rather than system gituse-configured-gitRobert Schilling2017-01-051-1/+1
| | |
* | | Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master' 20450-retry-build-buttonSean McGivern2017-01-121-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for PlantUML diagrams in Asciidoc. Closes #17603 See merge request !8537
| * | | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with *src* pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603
* | | | New error message recreating projects on pending deletefix/project-delete-tooltipJames Lopez2017-01-112-0/+30
|/ / /
* | | Merge branch '24139-production-wildcard-for-cycle-analytics' into 'master' Sean McGivern2017-01-101-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Treat environments matching `production/*` as Production for Cycle Analytics Closes #24139 See merge request !8500
| * | | Treat environments matching `production/*` as Production24139-production-wildcard-for-cycle-analyticsToon Claes2017-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Cycle Analytics, the environment `production` is treated as a special case, and used to update the `first_deployed_to_production_at` metric. With the Review Apps changes, slash syntax is used to group related environments in the list. This is mostly used for `review/<branch>` environments, but it's possible for people to have multiple production environments, and someone might then want to group them like `production/eu`, `production/us`, or even just make it look prettier with `production/www.example.com`. In any of these cases, the first deploy to one of these `production/*` environments now is treated as a Production deploy.
* | | | Merge branch 'auto-pipelines-vue' into 'master' Fatih Acet2017-01-091-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Pipelines Vue See merge request !7196
| * \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2017-01-097-7/+55
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-051-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (35 commits) Adds back removed class in merge request pipelines table Fix dropdown icon alignment Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups Adds CHANGELOG entry Removes unneeded `window` declaration Decreases font-size on login page Ensure internal Gitlab::Git references use the namespace Absorb gitlab_git Fix review comments. Add spec for note edit and fix one commented spec. Review fixes. Use gl.utils.isInViewport and improve gl.utils.animateToElement. Make sure elements share the same scope Hide edit warning element when form reverted. Remove unnecessary styling came from merge conflicts. Fix single note edit form specs. Separate edit form in Changes and Discussions tab. Fix warning styling for responsive design. Fix task list for single edit note widget changes. Fix notes spec. ...
| * | | | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-0414-35/+28
| |\ \ \ \ \
| * \ \ \ \ \ fix pipelines/index.html.haml merge conflictRegis2017-01-0211-35/+134
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into auto-pipelines-vueRegis2016-12-242-3/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master and fix application.rb conflictRegis2016-12-239-19/+56
| |\ \ \ \ \ \ \
| * | | | | | | | Add specs for pipeline entity and improve factoryGrzegorz Bizon2016-12-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-2127-126/+465
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (367 commits) Set “Remove branch” button to default size remove unused helper method reduce common code even further to satisfy rake flay remove button class size alteration from revert and cherry pick links factor out common code to satisfy rake flay homogenize revert and cherry-pick button styles generated by commits_helper apply margin on alert banners only when there is one or more alerts Rename MattermostNotificationService back to MattermostService Rename SlackNotificationService back to SlackService Fix stage and pipeline specs and rubocop offenses Added QueryRecorder to test N+1 fix on Milestone#show Use gitlab-workhorse 1.2.1 Make 'unmarked as WIP' message more consistent Improve specs for Files API Allow unauthenticated access to Repositories Files API GET endpoints Add isolated view spec for pipeline stage partial Move test for HTML stage endpoint to controller specs Fix sizing of avatar circles; add border Fix broken test Fix broken test Changes after review ... Conflicts: app/assets/stylesheets/pages/pipelines.scss app/controllers/projects/pipelines_controller.rb app/views/projects/pipelines/index.html.haml spec/features/projects/pipelines/pipelines_spec.rb
| * \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-12-1624-149/+229
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve performance of Pipelines APIKamil Trzcinski2016-12-151-2/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'label-length-validation' into 'master' Rémy Coutable2017-01-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate label's title length See merge request !5767
| * | | | | | | | | | | validate length of label.titleTomáš Kukrál2017-01-091-0/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + add test for label.title length validation
* | | | | | | | | | | Merge branch 'remove-project-authorizations-id-column' into 'master' Douwe Maan2017-01-092-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the project_authorizations.id column See merge request !8479
| * | | | | | | | | | Remove the project_authorizations.id columnremove-project-authorizations-id-columnYorick Peterse2017-01-082-3/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This column used to be a 32 bits integer, allowing for only a maximum of 2 147 483 647 rows. Given enough users one can hit this limit pretty quickly, as was the case for GitLab.com. Changing this type to bigint (= 64 bits) would give us more space, but we'd eventually hit the same limit given enough users and projects. A much more sustainable solution is to simply drop the "id" column. There were only 2 lines of code depending on this column being present, and neither truly required it to be present. Instead the code now uses the "project_id" column combined with the "user_id" column. This means that instead of something like this: DELETE FROM project_authorizations WHERE user_id = X AND id = Y; We now run the following when removing rows: DELETE FROM project_authorizations WHERE user_id = X AND project_id = Y; Since both user_id and project_id are indexed this should not slow down the DELETE query. This commit also removes the "dependent: destroy" clause from the "project_authorizations" relation in the User and Project models. Keeping this prevents Rails from being able to remove data as it relies on an "id" column being present. Since the "project_authorizations" table has proper foreign keys set up (with cascading removals) we don't need to depend on any Rails logic.
* | | | | | | | | | Merge branch 'remove-successful-pipeline-emails-for-now' into 'master' Sean McGivern2017-01-091-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make successful pipeline emails off for watchers Closes #24845 See merge request !8176
| * | | | | | | | | | Introduce EXCLUDED_WATCHER_EVENTS to exclude eventsremove-successful-pipeline-emails-for-nowLin Jen-Shin2017-01-051-0/+4
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for watchers. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8176#note_20920905
* | | | | | | | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-091-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record and show last used date of SSH Keys See merge request !8113
| * | | | | | | | | Record and show last used date of SSH KeysVincent Wong2017-01-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses: Issue #13810 1. Adds a last_used_at attribute to the Key table/model 2. Update a key's last_used_at whenever it gets used 3. Display how long ago an ssh key was last used
* | | | | | | | | | Merge branch 'speed-up-group-milestone-index' into 'master' Sean McGivern2017-01-064-6/+46
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up group milestone index by passing group_id to IssuesFinder See merge request !8363
| * | | | | | | | | | Speed up group milestone index by passing group_id to IssuesFinderAdam Niedzielski2017-01-064-6/+46
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch ↵Fatih Acet2017-01-051-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26155-merge-request-tabs-don-t-render-when-no-commits-available' into 'master' Resolve "Merge request tabs don't render when no commits available" Closes #26155 and #24556 See merge request !8347
| * | | | | | | | | prevent 500 error when selecting changes tab for non-existent branchMike Greiling2017-01-031-1/+1
| | | | | | | | | |
* | | | | | | | | | Absorb gitlab_gitRobert Speicher2017-01-041-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'add_email_password_confirmation' into 'master' Douwe Maan2017-01-041-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add email confirmation field to registration form Closes #3053 See merge request !7432
| * | | | | | | | | Add email and password confirmation fields to registration formDrew Blessing2017-01-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's too easy to mistype an email or password when signing up. The support team is receiving an increasing number of requests because users mistype their email. We can eliminate this problem by requiring users to confirm the email before registering. The same issue can occur for the password field so we should add this, too. We should note that password confirmation is part of the default Devise forms. I don't know why/when GitLab removed it.
* | | | | | | | | | Merge branch 'rs-remove-unused-method' into 'master' Douwe Maan2017-01-041-4/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused `Project#web_url_without_protocol` method See merge request !8416
| * | | | | | | | | Remove unused `Project#web_url_without_protocol` methodrs-remove-unused-methodRobert Speicher2017-01-031-4/+0
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-0314-31/+27
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
* | | | | | | | Merge branch 'issue_22664' into 'master' Sean McGivern2016-12-291-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if user can read project before being assigned to issue Closes #22664 See merge request !7980
| * | | | | | | | Check if user can read issue before being assignedissue_22664Felipe Artur2016-12-271-3/+3
| | | | | | | | |
| * | | | | | | | Fix issuable assignee update bug when previous assignee is nullFelipe Artur2016-12-201-3/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'mentioned-but-not-closed-issues-messages' into 'master' Sean McGivern2016-12-291-5/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unclear closing issue behaviour on Merge Request show page Closes #26152 See merge request !8345
| * | | | | | | | use MergeRequest#closes_issues instead of rewriting code to retrieve closing ↵Gabriel Gizotti2016-12-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues on MergeRequest#issues_mentioned_but_not_closing
* | | | | | | | | Merge branch 'dz-nested-group-access' into 'master' Dmitriy Zaporozhets2016-12-291-4/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Inherit permissions from parent group See merge request !8071