summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Fix DB schema to match latest migrationsh-update-db-schemaStan Hu2016-09-081-1/+1
|
* Support empty PG database toozj-gitorious-migration-empty-pg-databaseZ.J. van de Weg2016-09-061-2/+1
| | | | | First check if there is a result on the migration, else there is nothing to do
* Don't fail on an empty databasezj-drop-gitorious-fieldZ.J. van de Weg2016-09-052-6/+11
|
* Support MySQL too, when removing gitorious from import_sourcesZ.J. van de Weg2016-09-051-1/+5
|
* Remove gitorious from import_sources on ApplicationSetting modelZ.J. van de Weg2016-09-052-1/+32
|
* Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-09-054-24/+71
|\ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Add migration to set confidential issues events on web hooksDouglas Barbosa Alexandre2016-09-012-1/+16
| |
| * Add option to confidential issues events to trigger servicesDouglas Barbosa Alexandre2016-08-312-12/+28
| |
| * Add option to confidential issues events to trigger WebhooksDouglas Barbosa Alexandre2016-08-312-11/+27
| |
* | Project tools visibility levelFelipe Artur2016-09-014-6/+103
|/
* Remove not-null constraint on lock_version column if it existsStan Hu2016-08-302-1/+14
| | | | Closes #21678
* Merge branch 'project-specific-lfs' into 'master' Robert Speicher2016-08-302-0/+30
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfsPatricio Cano2016-08-302-3/+3
| |
| * Added project specific enable/disable setting for LFSPatricio Cano2016-08-302-0/+30
| |
* | Remove default value for lock_versionValery Sizov2016-08-302-1/+17
|/
* Drop unused CI tables and fileszj-remove-unused-ci-tablesZ.J. van de Weg2016-08-262-18/+12
| | | | | | | | 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.
* Add lock_version to merge_requests tableadd-lock-version-to-mr-schemaStan Hu2016-08-251-0/+1
| | | | | | | Closes #21465 It appears this column was mistakenly omitted in !5623 due to rebasing issues in earlier comments.
* Merge branch 'dz-merge-request-version'Douwe Maan2016-08-253-2/+39
|\
| * Fix db schema via db:migrate:resetDmitriy Zaporozhets2016-08-221-18/+16
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-227-44/+158
| |\ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1913-42/+296
| |\ \ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1513-93/+240
| |\ \ \ | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Change merge request diff index to be not uniqDmitriy Zaporozhets2016-08-023-7/+45
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Change merge_error column from string to text typeStan Hu2016-08-232-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, the artificial 255-character limit would cause an error in MergeWorker. Closes #20593
* | | | | Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-222-15/+35
| |_|_|/ |/| | |
* | | | Merge branch 'fix-diff-note-discussion-id' into 'master' Rubén Dávila Santos2016-08-203-1/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call `set_discussion_id` again in DiffNote `before_validation` because the order is important See merge request !5913
| * | | | Call `set_discussion_id` again in DiffNote `before_validation` because the ↵Douwe Maan2016-08-193-1/+28
| | | | | | | | | | | | | | | | | | | | order is important
* | | | | Support integration with Koding (online IDE)Gokmen Goksel2016-08-192-0/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-193-2/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
| * \ \ \ Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-193-2/+29
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | # Conflicts: # db/schema.rb
| * | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-182-0/+30
| |\ \ \ \
| * | | | | Allow project group links to be expiredSean McGivern2016-08-182-1/+31
| | | | | |
| * | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1822-112/+464
| |\ \ \ \ \
| * | | | | | Use Date instead of Datetime. Nobody cares about the exact hour.Adam Niedzielski2016-08-042-2/+2
| | | | | | |
| * | | | | | WIPAdam Niedzielski2016-08-012-1/+31
| | | | | | |
* | | | | | | Merge branch 'fix/pipeline-seeds-in-dev-env' into 'master' Robert Speicher2016-08-191-42/+57
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Move and improvement comment in pipeline fixturesfix/pipeline-seeds-in-dev-envGrzegorz Bizon2016-08-191-5/+4
| | | | | | |
| * | | | | | Change name of the class that with pipeline seedsGrzegorz Bizon2016-08-181-2/+2
| | | | | | |
| * | | | | | Rename file that holds pipeline fixtures in dev envGrzegorz Bizon2016-08-181-0/+0
| | | | | | |
| * | | | | | Reduce the number of build fixtures created in devGrzegorz Bizon2016-08-181-1/+1
| | | | | | |
| * | | | | | Reorder failed stages and improve build statusesGrzegorz Bizon2016-08-181-5/+6
| | | | | | |
| * | | | | | Fix build artifacts in fixtures in development envGrzegorz Bizon2016-08-181-24/+30
| | | | | | |
| * | | | | | Fix build logs in development environment fixturesGrzegorz Bizon2016-08-181-5/+9
| | | | | | |
| * | | | | | Refactor pipeline fixtures for dev env a littleGrzegorz Bizon2016-08-181-15/+20
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-182-0/+30
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher2016-08-182-1/+31
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Allow naming U2F devices.Timothy Andrew2016-08-182-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-181-5/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '18141-pipeline-graph' into 'master' Jacob Schatz2016-08-171-5/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Update fixtures to add a created status to pipelineKamil Trzcinski2016-08-171-5/+4
| | | | | | |