Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/db
AgeCommit message (Collapse)Author
2016-09-01Project tools visibility levelFelipe Artur
2016-08-31Remove not-null constraint on lock_version column if it existsStan Hu
Closes #21678
2016-08-31Merge branch 'project-specific-lfs' into 'master' Robert Speicher
Added project specific enable/disable setting for LFS ## What does this MR do? Adds project specific enable/disable setting for LFS ## What are the relevant issue numbers? Needed for #18092 See merge request !5997
2016-08-31Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.Patricio Cano
2016-08-31Added project specific enable/disable setting for LFSPatricio Cano
2016-08-30Remove default value for lock_versionValery Sizov
2016-08-26Drop unused CI tables and filesZ.J. van de Weg
These tables, web hooks and services, are unused but where not dropped with the commits d5c91bb9a601a1a344d94763654f0b0996857497 and 2988e1fbf50b3c9e803a9358933e3e969e64dcc3. The file was left too, but never called.
2016-08-25Add lock_version to merge_requests tableStan Hu
Closes #21465 It appears this column was mistakenly omitted in !5623 due to rebasing issues in earlier comments.
2016-08-25Merge branch 'dz-merge-request-version'Douwe Maan
2016-08-23Change merge_error column from string to text typeStan Hu
In some cases, the artificial 255-character limit would cause an error in MergeWorker. Closes #20593
2016-08-22Fix db schema via db:migrate:resetDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-22Revert the revert of Optimistic LockingValery Sizov
2016-08-22Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-20Merge branch 'fix-diff-note-discussion-id' into 'master' Rubén Dávila Santos
Call `set_discussion_id` again in DiffNote `before_validation` because the order is important See merge request !5913
2016-08-20Call `set_discussion_id` again in DiffNote `before_validation` because the ↵Douwe Maan
order is important
2016-08-19Support integration with Koding (online IDE)Gokmen Goksel
Koding: #index: landing page for Koding integration If enabled it will provide a link to open remote Koding instance url for now we are also providing the sneak preview video for how integration works in detail. Repository: check whether .koding.yml file exists on repository Projects: landing page: show Run in IDE (Koding) button if repo has stack file Projects: MR: show Run in IDE Koding button if repo has stack file on active branch ProjectHelpers: add_koding_stack: stack generator for provided project With this helper we will auto-generate the required stack template for a given project. For the feature we can request this base template from the running Koding instance on integration. Currently this will provide users to create a t2.nano instance on aws and it'll automatically configures the instance for basic requirements. Projects: empty state and landing page provide shortcuts to create stack projects_helper: use branch on checkout and provide an entry point This ${var.koding_queryString_branch} will be replaced with the branch provided in query string which will allow us to use same stack template for different branches of the same repository. ref: https://github.com/koding/koding/pull/8597/commits/b8c0e43c4c24bf132670aa8a3cfb0d634acfd09b projects_helper: provide sha info in query string to use existing vms With this change we'll be able to query existing vms on Koding side based on the commit id that they've created. ref: https://github.com/koding/koding/pull/8597/commits/1d630fadf31963fa6ccd3bed92e526761a30a343 Integration: Docs: Koding documentation added Disable /koding route if integration is disabled Use application settings to enable Koding Projects_helper: better indentation with strip_heredoc usage Projects_helper: return koding_url as is if there is no project provided current_settings: set koding_enabled: false by default Koding_Controller: to render not_found once integration is disabled Dashboard_specs: update spec for Koding enabled case Projects_Helper: make repo dynamic ref: https://github.com/koding/koding/pull/8597/commits/4d615242f45aaea4c4986be84ecc612b0bb1514c Updated documentation to have right format
2016-08-19Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan
Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
2016-08-19Merge branch 'fix/pipeline-seeds-in-dev-env' into 'master' Robert Speicher
Improve pipeline fixtures in development environment ### What does this MR do? This MR adds further improvements to seeds for development environment: * fixes build artifacts fixtures * fixes build log fixtures * moves unsuccessful jobs to the last triggered stage See merge request !5838
2016-08-19Move and improvement comment in pipeline fixturesGrzegorz Bizon
2016-08-19Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern
# Conflicts: # db/schema.rb
2016-08-19Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-19Merge branch 'master' into expiration-date-on-membershipsSean McGivern
2016-08-19Allow project group links to be expiredSean McGivern
2016-08-19Merge branch 'master' into diff-line-comment-vuejsDouwe Maan
# Conflicts: # db/schema.rb
2016-08-18Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher
Allow naming (and deleting) U2F devices. ## What does this MR do? - Allow giving each U2F device a name (at the time of registration). - Allow deleting individual U2F devices. - Display a list of registered U2F devices. ## What are the relevant issue numbers? - Closes #17334 - Closes #17335 See merge request !5833
2016-08-18Allow naming U2F devices.Timothy Andrew
1. Display a list of U2F devices on the `two_factor_auth` page. 2. Allow deleting individual U2F devices. 3. Allow setting a (optional) name for a device (during registration).
2016-08-18Merge branch 'master' into diff-line-comment-vuejsConnor Shea
2016-08-18Merge branch 'master' into expiration-date-on-membershipsSean McGivern
2016-08-18Change name of the class that with pipeline seedsGrzegorz Bizon
2016-08-18Rename file that holds pipeline fixtures in dev envGrzegorz Bizon
2016-08-18Reduce the number of build fixtures created in devGrzegorz Bizon
2016-08-18Reorder failed stages and improve build statusesGrzegorz Bizon
2016-08-18Fix build artifacts in fixtures in development envGrzegorz Bizon
2016-08-18Fix build logs in development environment fixturesGrzegorz Bizon
2016-08-18Refactor pipeline fixtures for dev env a littleGrzegorz Bizon
2016-08-18Merge branch '18141-pipeline-graph' into 'master' Jacob Schatz
Add pipeline graph ## What does this MR do? Adds pipeline visualization ## What are the relevant issue numbers? Closes #18141 Part of #19982 ## Screenshots (if relevant) ![Screen_Shot_2016-08-16_at_7.59.52_PM](/uploads/c9dd695d2ddbd2a85e98a5b4e500d52c/Screen_Shot_2016-08-16_at_7.59.52_PM.png) ![Screen_Shot_2016-08-16_at_7.55.49_PM](/uploads/5ab548cc5fc8a42371d3b54108798c02/Screen_Shot_2016-08-16_at_7.55.49_PM.png) See merge request !5742
2016-08-17Merge branch 'master' into diff-line-comment-vuejsConnor Shea
2016-08-17Merge branch 'issue-boards' into 'master' Douwe Maan
Issue boards ## What are the relevant issue numbers? - Issue: #17907 - Issue backend: #20335 - Backend MR: !5548 - Frontend MR: !5554 - Documentation !5713 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [X] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5548
2016-08-17Store discussion_id on Note for faster discussion lookup.Douwe Maan
2016-08-17Merge branch '18681-pipelines-merge-request' into 'master' Jacob Schatz
Resolve "Pipelines for merge request" ## What does this MR do? Adds `Pipelines` tab in merge request view ## What are the relevant issue numbers? Closes #18681 ## Screenshots (if relevant) ![Screen_Shot_2016-08-16_at_3.22.41_PM](/uploads/c04febab3765b1fac2bf3bbfb9882f9f/Screen_Shot_2016-08-16_at_3.22.41_PM.png) See merge request !5485
2016-08-17Ensure that we have only one list per label per boardDouglas Barbosa Alexandre
2016-08-17Order board lists by list_type, and positionDouglas Barbosa Alexandre
2016-08-17fixup! Add List modelDouglas Barbosa Alexandre
2016-08-17Add Board modelDouglas Barbosa Alexandre
2016-08-17Update fixtures to add a created status to pipelineKamil Trzcinski
2016-08-17Merge remote-tracking branch 'origin/master' into 18141-pipeline-graphKamil Trzcinski
2016-08-17Update fixtures to make development testing easierKamil Trzcinski
2016-08-17Merge branch 'master' into diff-line-comment-vuejsConnor Shea
2016-08-16Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski
pipeline-hooks-without-slack
2016-08-16Remove accidental addition of table and index.Connor Shea