summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Avoid caching BroadcastMessage as an ActiveRecord objectStan Hu2018-12-081-3/+39
| | | | | | | | | | | | When a Rails 4 host serializes a BroadcastMessage, it will serialize `ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer`, which does not exist in Rails 5. This will cause Error 500s on a Rails 5 reading from this cache. To make Rails 4 and 5 play well together, store the data as JSON and construct the ActiveRecord objects from JSON. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55034
* CE Backport: Epic issue list and related issue list re-designKushal Pandya2018-12-083-6/+198
|
* Resolve "Navigating unresolved discussions on Merge Request page"André Luís2018-12-089-19/+105
|
* Resolve "Extended user centric tooltips"Tim Zallmann2018-12-0816-8/+308
|
* Merge branch 'ce-jej/group-saml-sso-button-link-description' into 'master'Clement Ho2018-12-081-0/+1
|\ | | | | | | | | [CE] Backport SAML unlink changes: UrlBlocker#ascii_only See merge request gitlab-org/gitlab-ce!23627
| * Allow URLs to be validated as ascii_onlyJames Edwards-Jones2018-12-061-0/+1
| | | | | | | | | | Restricts unicode characters and IDNA deviations which could be used in a phishing attack
* | Merge branch '53147-utilize-new-charting-library-for-metrics-dashboard' into ↵Clement Ho2018-12-083-2/+109
|\ \ | | | | | | | | | | | | | | | | | | 'master' Resolve "Utilize new charting library for metrics dashboard" See merge request gitlab-org/gitlab-ce!23459
| * | Use GitLab UI area chartAdriel Santiago2018-12-073-2/+109
| | | | | | | | | | | | | | | Replace the metrics dashboard graph with GitLab UI's area chart component
* | | Integrate csslabClement Ho2018-12-0812-12/+16
|/ /
* | Merge branch '20422-hide-ui-variables-by-default' into 'master'Robert Speicher2018-12-073-26/+56
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Hide variables in UI by default" Closes #20422 See merge request gitlab-org/gitlab-ce!23518
| * \ Merge remote-tracking branch 'origin/master' into ↵jhampton2018-12-07403-2448/+4683
| |\ \ | | | | | | | | | | | | 20422-hide-ui-variables-by-default
| * | | Add specs for TriggerVariableEntityMatija Čupić2018-12-071-1/+1
| | | |
| * | | Vertically aligns variablesjhampton2018-12-071-0/+1
| | | | | | | | | | | | | | | | - Long named variable key/values are vertially aligned
| * | | Adjusts variables table widthjhampton2018-12-061-0/+1
| | | | | | | | | | | | | | | | - The table width was shrinking with smaller variable names
| * | | Fixes linting errorjhampton2018-12-061-9/+3
| | | | | | | | | | | | | | | | - Fixes linting error around missing key directive
| * | | Horizontally aligns textjhampton2018-12-051-0/+1
| | | | | | | | | | | | | | | | - Horizontall aligns span and button text
| * | | Updates per MR feedbackjhampton2018-12-041-11/+9
| | | | | | | | | | | | | | | | | | | | - Removes element in favor of class name - Adjusts to use existing variables
| * | | Updates per MR feedbackjhampton2018-12-041-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adjusts il8n implementation - Removes unnecessary type check - Adjusts to use Vue shorthand directives - Adjusts class names
| * | | Conditionally display variable valuesjhampton2018-12-031-25/+51
| | | | | | | | | | | | | | | | | | | | We want to hide trigger varialbes values in the UI by default. A toggle button will be available to maintainers.
| * | | Styles trigger variables blockjhampton2018-12-031-1/+15
| | | | | | | | | | | | | | | | Adds new style to the trigger variables table.
| * | | Conditionally send variable valuesjhampton2018-12-031-1/+2
| | | | | | | | | | | | | | | | | | | | We only want to send trigger variable values if the user is a maintainer.
* | | | Merge branch 'cert-manager-email' into 'master'Dmitriy Zaporozhets2018-12-077-27/+71
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Ability to override Issuer Email for Cert Manager See merge request gitlab-org/gitlab-ce!23503
| * | | | Allows user to override default issuer email for cert managerAmit Rathi2018-12-077-27/+71
| | | | |
* | | | | Merge branch 'zj-pool-repository-creation' into 'master'Nick Thomas2018-12-079-0/+221
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Allow public forks to be deduplicated See merge request gitlab-org/gitlab-ce!23508
| * | | | Allow public forks to be deduplicatedZeger-Jan van de Weg2018-12-079-0/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is forked, the new repository used to be a deep copy of everything stored on disk by leveraging `git clone`. This works well, and makes isolation between repository easy. However, the clone is at the start 100% the same as the origin repository. And in the case of the objects in the object directory, this is almost always going to be a lot of duplication. Object Pools are a way to create a third repository that essentially only exists for its 'objects' subdirectory. This third repository's object directory will be set as alternate location for objects. This means that in the case an object is missing in the local repository, git will look in another location. This other location is the object pool repository. When Git performs garbage collection, it's smart enough to check the alternate location. When objects are duplicated, it will allow git to throw one copy away. This copy is on the local repository, where to pool remains as is. These pools have an origin location, which for now will always be a repository that itself is not a fork. When the root of a fork network is forked by a user, the fork still clones the full repository. Async, the pool repository will be created. Either one of these processes can be done earlier than the other. To handle this race condition, the Join ObjectPool operation is idempotent. Given its idempotent, we can schedule it twice, with the same effect. To accommodate the holding of state two migrations have been added. 1. Added a state column to the pool_repositories column. This column is managed by the state machine, allowing for hooks on transitions. 2. pool_repositories now has a source_project_id. This column in convenient to have for multiple reasons: it has a unique index allowing the database to handle race conditions when creating a new record. Also, it's nice to know who the host is. As that's a short link to the fork networks root. Object pools are only available for public project, which use hashed storage and when forking from the root of the fork network. (That is, the project being forked from itself isn't a fork) In this commit message I use both ObjectPool and Pool repositories, which are alike, but different from each other. ObjectPool refers to whatever is on the disk stored and managed by Gitaly. PoolRepository is the record in the database.
* | | | | Merge branch 'ce-4326-one-notification-per-code-review' into 'master'Douwe Maan2018-12-074-17/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backports changes made to One notification per code review See merge request gitlab-org/gitlab-ce!23656
| * | | | | Backports changes made to One notification per code reviewTiago Botelho2018-12-074-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The EE merge request can be found here: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8442
* | | | | | Merge branch '51243-further-improvements-to-project-overview-ui' into 'master'Mike Greiling2018-12-0726-284/+497
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Further improvements to Project overview UI" Closes #51243 See merge request gitlab-org/gitlab-ce!22196
| * | | | | | Further design iteration on project overviewDennis Tang2018-12-0726-284/+497
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continues the iteration on the project overview UI: - moved star, fork and new clone button (copy SSH/HTTPS URLs) to top right, made them smaller - avatar is now larger (64px) - 'Request access' is now a link instead of a button - overview comes before the description + changed styling and added icons - description font-size is now 16px (large-paragraph) - quick links to files are moved downwards below the commit/pipeline info - margins changed to group content into 4 groups to clean up the interface - visibility info reduced to icon-only and moved to the right of the title
* | | | | | CE Port of "Web Terminal FE"Paul Slaughter2018-12-076-19/+81
| |/ / / / |/| | | |
* | | | | Merge branch 'dm-remove-prune-web-hook-logs-worker' into 'master'Robert Speicher2018-12-072-15/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove RemoveOldWebHookLogsWorker Closes #52592 See merge request gitlab-org/gitlab-ce!23628
| * | | | | Remove RemoveOldWebHookLogsWorkerDouwe Maan2018-12-072-15/+0
| | | | | |
* | | | | | Merge branch 'store-correlation-logs' into 'master'Stan Hu2018-12-073-14/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log and pass correlation-id between Unicorn, Sidekiq and Gitaly See merge request gitlab-org/gitlab-ce!22844
| * | | | | | Log and pass correlation-id between Unicorn, Sidekiq and GitalyKamil Trzciński2018-12-063-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Correlation ID is taken or generated from received X-Request-ID. Then it is being passed to all executed services (sidekiq workers or gitaly calls). The Correlation ID is logged in all structured logs as `correlation_id`.
* | | | | | | Merge branch '48889-populate-merge_commit_sha' into 'master'Douwe Maan2018-12-071-4/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge request's merge_commit after branch update Closes #48889 See merge request gitlab-org/gitlab-ce!22794
| * | | | | | | Guard with feature flagMark Chao2018-12-071-5/+10
| | | | | | | |
| * | | | | | | Update merge request's merge_commit for branch updateMark Chao2018-12-071-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analyze new commits graph to determine each commit's merge commit. Fix "merged with [commit]" info for merge requests being merged automatically by other actions. Allow analyzing upto the relevant commit
* | | | | | | | Merge branch '22548-reopen-error-message' into 'master'Filipa Lacerda2018-12-073-16/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve error message when attempting to reopen MR and there's a new open MR for the same branch Closes #22548 See merge request gitlab-org/gitlab-ce!22326
| * | | | | | | | Updated ajax error message with returned errorsPhil Hughes2018-12-071-6/+10
| | | | | | | | |
| * | | | | | | | Inline the new checks into normal update error handlingNick Thomas2018-12-072-19/+25
| | | | | | | | |
| * | | | | | | | Link to conflicting MR in reopening error messageAkos Gyimesi2018-12-062-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, the error message became shorter.
| * | | | | | | | Improve error message when attempting to reopen MR and there's a new open MR ↵Akos Gyimesi2018-12-062-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the same branch
* | | | | | | | | Merge branch 'fix-transaction-shard' into 'master'Douwe Maan2018-12-071-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix transaction pollution in Shard.by_name See merge request gitlab-org/gitlab-ce!23655
| * | | | | | | | Fix transaction pollution in Shard.by_nameNick Thomas2018-12-071-1/+3
| | | | | | | | |
* | | | | | | | | Show primary button when all labels are prioritizedGeorge Tsiolis2018-12-071-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'kp-8703-fix-labels-tooltip-alignment' into 'master'Filipa Lacerda2018-12-071-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Fix labels tooltip in collapsed Epics sidebar See merge request gitlab-org/gitlab-ce!23647
| * | | | | | | | Add missing `data-boundary` attribute for correct tooltip alignmentKushal Pandya2018-12-071-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'winh-milestone-select' into 'master'Kushal Pandya2018-12-071-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicate boardsStore variable in milestone select Closes #54139 See merge request gitlab-org/gitlab-ce!23625
| * | | | | | | | | Fix duplicate boardsStore variable in milestone selectWinnie Hellmann2018-12-061-4/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'jprovazn-fast-upload-delete' into 'master'Grzegorz Bizon2018-12-078-7/+189
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use FastDestroy for deleting uploads Closes #46069 See merge request gitlab-org/gitlab-ce!20977