summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
| | * | | Merge remote-tracking branch 'origin/master' into 18141-pipeline-graphKamil Trzcinski2016-08-1712-88/+317
| | |\ \ \ | | | |/ /
| | * | | Update fixtures to make development testing easierKamil Trzcinski2016-08-171-6/+26
| | | | |
* | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-175-6/+94
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'issue-boards' into 'master' Douwe Maan2016-08-174-0/+68
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Ensure that we have only one list per label per boardDouglas Barbosa Alexandre2016-08-172-0/+16
| | | | | |
| | * | | | Order board lists by list_type, and positionDouglas Barbosa Alexandre2016-08-172-4/+4
| | | | | |
| | * | | | fixup! Add List modelDouglas Barbosa Alexandre2016-08-171-0/+4
| | | | | |
| | * | | | Add Board modelDouglas Barbosa Alexandre2016-08-173-0/+48
| | | |/ / | | |/| |
| * | | | Merge branch '18681-pipelines-merge-request' into 'master' Jacob Schatz2016-08-171-6/+26
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Update fixtures to make development testing easierKamil Trzcinski2016-08-161-6/+26
| | | | |
* | | | | Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-172-2/+17
| | | | |
* | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-167-32/+142
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-08-164-1/+78
| |\ \ \ \ | | |/ / / | | | | | | | | | | pipeline-hooks-without-slack
| | * | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-154-1/+78
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submit to Akismet Part 1 (Issues) Related to #5932 #5573 gitlab-com/infrastructure#14 See merge request !5538
| | | * | | Further refactor and syntax fixes.Patricio Cano2016-08-152-2/+2
| | | | | |
| | | * | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-152-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | - Refactored SpamCheckService into SpamService
| | | * | | Allow `Issue` to be submitted as spamPatricio Cano2016-08-152-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added controller actions as reusable concerns - Added controller tests
| | | * | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-152-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added `submitted_as_ham` to `SpamLog` to mark which logs have been submitted to Akismet. - Added routes and controller action.
| | | * | | Refactored spam related code even furtherPatricio Cano2016-08-152-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed unnecessary column from `SpamLog` - Moved creation of SpamLogs out of its own service and into SpamCheckService - Simplified code in SpamCheckService. - Moved move spam related code into Spammable concern
| | | * | | Lay the ground works to submit information to AkismetPatricio Cano2016-08-152-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New concern `AkismetSubmittable` to allow issues and other `Spammable` models to be submitted to Akismet. - New model `UserAgentDetail` to store information needed for Akismet. - Services needed for their creation and tests.
| * | | | | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-151-30/+29
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'fix/build-seeds-in-development-environment' into 'master' Grzegorz Bizon2016-08-151-30/+29
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline and build seeds in development environment ## What does this MR do? When we depend on state machine events in seeds, it is likely that we will break fixtures from time to time because when transition rules change, using events most likely invalidates some objects in seeds ## Why was this MR needed? Pipeline and build seeds were broken in development environment. ## What are the relevant issue numbers? Closes #20933 See merge request !5810
| | | * | | Fix pipeline and build seeds in development environmentGrzegorz Bizon2016-08-151-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we depend on state machine events in seeds, it is likely that we will break fixtures from time to time because when transition rules change, using events most likely invalidates some objects in seeds.
| * | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-151-1/+1
| |\ \ \ \ \ | | |/ / / /