summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Apply suggestion to app/helpers/visibility_level_helper.rbsh-default-visibility-fixBob Van Landuyt2019-06-061-1/+1
|
* Set project default visibility to max allowedStan Hu2019-06-052-1/+39
| | | | | | | | | | If the default, instance-wide visibility were set to internal but a group were private, the radio button would be set on internal even though that setting were not allowed. We now consider the allowed visibility setting for the group in determining what the default should be. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62298
* Migrate old notes app test from Karma to JestMartin Hanzel2019-06-051-0/+4
|
* Setup Git client for JupyterAmit Rathi2019-06-052-2/+11
|
* added new styling to the `.flash-warning` styles and moved the bundled style ↵Michel Engelen2019-06-051-14/+15
| | | | definitions up to allow overrides for specific flash-types
* Merge branch 'issue_49897' into 'master'Robert Speicher2019-06-055-11/+34
|\ | | | | | | | | | | | | Delete unauthorized Todos when project is private Closes #49897 See merge request gitlab-org/gitlab-ce!28560
| * Delete unauthorized Todos when project is privateissue_49897Felipe Artur2019-06-055-11/+34
| | | | | | | | | | Delete Todos for guest users when project visibility level is updated to private.
* | Merge branch '11204-turn-off-mask-by-default' into 'master'Mike Greiling2019-06-053-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Default masked to false for new variables Closes gitlab-ee#11204 See merge request gitlab-org/gitlab-ce!28186
| * | Default masked to false for new variables11204-turn-off-mask-by-defaultmfluharty2019-06-043-3/+3
| | | | | | | | | | | | | | | | | | Set the default value to false Adjust tests to expect false as the default Update documentation to make new default clear
* | | Merge branch '54140-non-ar-cache-commit-markdown' into 'master'Douwe Maan2019-06-053-80/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Redis for CacheMarkDownField on non AR models Closes #54140 See merge request gitlab-org/gitlab-ce!29054
| * | | Use markdown_field helper to display full_titlePatrick Bajao2019-06-051-1/+2
| | | |
| * | | Use Redis for CacheMarkDownField on non AR modelsPatrick Bajao2019-06-052-79/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows using `CacheMarkdownField` for models that are not backed by ActiveRecord. When the including class inherits `ActiveRecord::Base` we include `Gitlab::MarkdownCache::ActiveRecord::Extension`. This will cause the markdown fields to be rendered and the generated HTML stored in a `<field>_html` attribute on the record. We also store the version used for generating the markdown. All other classes that include this model will include the `Gitlab::MarkdownCache::Redis::Extension`. This add the `<field>_html` attributes to that model and will generate the html in them. The generated HTML will be cached in redis under the key `markdown_cache:<class>:<id>`. The class this included in must therefore respond to `id`.
* | | | Add snowplow haml attr helperLuke Bennett2019-06-052-11/+17
| | | | | | | | | | | | | | | | | | | | Helps build a hash of snowplow tracking data attrs. Updates import project pane to use new helper.
* | | | Merge branch 'graphql-file-entry-url' into 'master'Nick Thomas2019-06-058-3/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add web_url to tree entry in GraphQL API See merge request gitlab-org/gitlab-ce!28646
| * | | | Add web_url to tree entry in GraphQL APIPhil Hughes2019-06-058-3/+38
| | | | |
* | | | | Merge branch 'ce-10446-resolve-ee-diff-repository-check-mailer-notify' into ↵Phil Hughes2019-06-051-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [CE] Resolve CE/EE in repo check mailer notify html See merge request gitlab-org/gitlab-ce!29195
| * | | | | Resolve CE/EE in repo check mailer notify htmlPaul Slaughter2019-06-051-0/+2
| | | | | |
* | | | | | Merge branch '61246-fix-label-click-scroll-to-top' into 'master'Fatih Acet2019-06-051-0/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix label click scrolling to top Closes #61246 See merge request gitlab-org/gitlab-ce!29202
| * | | | | Fix label click scrolling to topPaul Slaughter2019-06-051-0/+5
| |/ / / /
* | | | | Merge branch '28996-create-mvc-ui-in-haml' into 'master'Filipa Lacerda2019-06-058-20/+131
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Let's Encrypt option in Pages domain new/edit Haml form See merge request gitlab-org/gitlab-ce!26438
| * | | | | Add auto SSL toggle to Pages domain settings page28996-create-mvc-ui-in-hamlNathan Friend2019-06-038-20/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds an auto SSL toggle switch to the settings page of GitLab Pages domains. This toggle enable or disabled auto SSL management via Let's Encrypt. Toggling the button dynamically updates the form using client-side JavaScript. All changes are behind feature flags.
* | | | | | Merge branch 'osw-avoid-500-on-suggestions-check' into 'master'Lin Jen-Shin2019-06-051-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid 500 when evaluating `DiffNote#supports_suggestion?` and commit is not reachable Closes #57570 See merge request gitlab-org/gitlab-ce!25408
| * | | | | Avoid 500's when commit is not reachableOswaldo Ferreira2019-06-051-1/+1
| | | | | |
* | | | | | Extract setListDetail() into issue boards storeWinnie Hellmann2019-06-053-2/+6
| | | | | |
* | | | | | Merge branch ↵Jan Provaznik2019-06-052-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | '11925-geo-sidekiq-nodes-try-to-run-jobs-even-thought-db-is-readonly' into 'master' Ensure DB is writable before continuing jobs See merge request gitlab-org/gitlab-ce!29134
| * | | | | Ensure DB is writable before continuing jobs11925-geo-sidekiq-nodes-try-to-run-jobs-even-thought-db-is-readonlyAsh McKenzie2019-06-052-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the context of a Geo setup, some jobs can be running on a Geo secondary where the database is read-only and therefore we should guard against various jobs attempting to write.
* | | | | | Merge branch 'bvl-use-global-ids-graphql' into 'master'Jan Provaznik2019-06-057-7/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use global IDs when exposing GraphQL resources Closes #62650 See merge request gitlab-org/gitlab-ce!29080
| * | | | | | Fix incorrect instances of `GraphQL::ID_TYPE`Bob Van Landuyt2019-06-035-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the `GraphQL::ID_TYPE` usages should represent globally unique ids, this changes some fields for which this is not the case into strings. The `ID_TYPE` is a specialised, so this change should be backwards compatible. https://graphql-ruby.org/type_definitions/scalars.html
| * | | | | | Expose IDs in GraphQL as a GlobalIDBob Van Landuyt2019-06-032-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This exposes all fields named `id` as GlobalIDs so they can be used across our entire GraphQL implementation. When the objects loaded are `ApplicationRecord`s. We'll use our existing batchloading to find them. Otherwise, we'll fall back to the default implementation of `GlobalID`: Calling the `.find` method on the class.
* | | | | | | Merge branch 'jivanvl-add-single-stat-chart-component' into 'master'Filipa Lacerda2019-06-051-0/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add single_stat chart component to the monitoring bundle See merge request gitlab-org/gitlab-ce!28948
| * | | | | | | Add single_stat chart component to the monitoring bundlejivanvl-add-single-stat-chart-componentJose Vargas2019-06-041-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge requests just adds the component without integrating it to the dashboard, it adds tests as well
* | | | | | | | Fix Web IDE add template testMark Lapierre2019-06-053-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait for the new file modal to stop animating before clicking it We now need to click the commit button 3 times: 1. To enter commit mode 2. To being staging changes 3. To submit the commit
* | | | | | | | Merge branch 'revert-git-depth-for-merge-request' into 'master'Kamil Trzciński2019-06-051-3/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Revert a default GIT_DEPTH for MR pipeline See merge request gitlab-org/gitlab-ce!28926
| * | | | | | | Revert a default GIT_DEPTH for MR pipelinerevert-git-depth-for-merge-requestFabio Pitino2019-05-311-3/+2
| | | | | | | |
* | | | | | | | Merge branch '55253-activity-feed-ui-enhance-line-height' into 'master'Phil Hughes2019-06-052-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Activity feed UI: Enhance line-height" Closes #55253 See merge request gitlab-org/gitlab-ce!28856
| * | | | | | | | Enhance line-height of Activity feed UI55253-activity-feed-ui-enhance-line-heightJacopo2019-05-312-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhances line-height of Activity feed UI to 20px.
* | | | | | | | | Fix whitespace changes visibility when the related file was initially collapsedOndřej Budai2019-06-051-1/+2
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Add render_projects method to controllerMartin Wortschack2019-06-053-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Render EE specific partial if exists
* | | | | | | | Specify exception identifer in catch blocksast-catch-unexpected-tokenPaul Gascou-Vaillancourt2019-06-041-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'ce-9578-adjust-opened-issues-count-and-completion-rate' into ↵Robert Speicher2019-06-042-15/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Port: EE adjust burndown chart opened issues count See merge request gitlab-org/gitlab-ce!28777
| * | | | | | | Adjust burndown chart opened issues countce-9578-adjust-opened-issues-count-and-completion-rateAlexandru Croitor2019-06-042-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adjust opened issues count in the milestone burndown chart to match current opened issues in the milestone. * Fix completion rate calculation to include milestones only.
* | | | | | | | Handle external dashboard form submissionAdriel Santiago2019-06-049-21/+98
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Connect frontend UI with backend api for external dashboard link
* | | | | | | Extract setIssueDetail() into issue boards storeWinnie Hellmann2019-06-043-3/+7
| | | | | | |
* | | | | | | Merge branch 'ce-fix-vue-spec-warning' into 'master'Fatih Acet2019-06-041-3/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warning in spec from committing unused mutation See merge request gitlab-org/gitlab-ce!28815
| * | | | | | | Fix warning in spec from committing unused mutationce-fix-vue-spec-warningSimon Knox2019-05-291-3/+0
| | | | | | | |
* | | | | | | | Merge branch '57037-fix-mr-checkboxes-mobile-alignment' into 'master'Fatih Acet2019-06-042-48/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR checkboxes alignment on mobile Closes #57037 See merge request gitlab-org/gitlab-ce!28845
| * | | | | | | | Fix MR checkboxes alignment on mobile57037-fix-mr-checkboxes-mobile-alignmentPaul Slaughter2019-05-302-48/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does this by removing the `.accept-control` class which was only causing problems.
* | | | | | | | | Extract toggleFilter() into issue boards storeWinnie Hellmann2019-06-042-18/+20
| | | | | | | | |
* | | | | | | | | Merge branch 'bvl-design-diff-notes-ce' into 'master'Douwe Maan2019-06-043-11/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjustments related to DiffNotes on diffs outside of a project's main repository See merge request gitlab-org/gitlab-ce!29023
| * | | | | | | | | Get `repository` from noteable in DiffNotesBob Van Landuyt2019-06-031-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting the `repository` directly from the noteable in DiffNotes allows us to use a different repository when the DiffNote is not on a project repository. It is only the first step in decoupling the DiffNote from a project's main repository.