summaryrefslogtreecommitdiff
path: root/db
Commit message (Expand)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 or...Douwe Maan2016-08-193-1/+28
* | Support integration with Koding (online IDE)Gokmen Goksel2016-08-192-0/+12
|/
* Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-193-2/+62
|\
| * Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-193-2/+29
| |\
| * \ 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
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher2016-08-182-1/+31
| |\ \ \ | | |/ / | |/| |
| | * | Allow naming U2F devices.Timothy Andrew2016-08-182-1/+31
* | | | 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
| |\ \ \
| | * | | 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
| |\ \ \ \
| | * | | | 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
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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 pipeline-hooks-...Kamil Trzcinski2016-08-164-1/+78
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-154-1/+78
| | |\ \ \
| | | * | | 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
| | | * | | Allow `Issue` to be submitted as spamPatricio Cano2016-08-152-0/+2
| | | * | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-152-0/+21
| | | * | | Refactored spam related code even furtherPatricio Cano2016-08-152-1/+29
| | | * | | Lay the ground works to submit information to AkismetPatricio Cano2016-08-152-0/+21
| * | | | | 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 environmentGrzegorz Bizon2016-08-151-30/+29
| * | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-151-1/+1
| |\ \ \ \ \ | | |/ / / /