summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add configured container registry key to .gitignoreGrzegorz Bizon2017-03-211-0/+1
|
* Creates specs for destroy service and improves namespace container image ↵Andre Guedes2017-02-238-65/+45
| | | | query performance
* Improved readability in tag/image delete conditionAndre Guedes2017-02-221-11/+17
|
* Fixing minor view issuesAndre Guedes2017-02-223-6/+6
|
* Adding mock for full_access_tokenAndre Guedes2017-02-221-0/+1
|
* Fixing typos in docsAndre Guedes2017-02-222-3/+3
|
* Fixes broken and missing testsAndre Guedes2017-02-2232-210/+211
|
* Adding registry endpoint authorizationAndre Guedes2017-02-2212-17/+133
|
* First iteration of container_image viewAndre Guedes2017-02-2217-169/+149
| | | | | | | - Fixes project, container_image and tag deletion - Removed container_images_repository [ci skip]
* Multi-level container image names backend implementationAndre Guedes2017-02-2214-7/+275
| | | | | | | - Adds Registry events API endpoint - Adds container_images_repository and container_images models - Changes JWT authentication to allow multi-level scopes - Adds services for container image maintenance
* Added MR Road mapAndre Guedes2017-02-221-0/+7
|
* Merge branch 'lnovy/gitlab-ce-empty-variables' into 'master'Rémy Coutable2017-02-223-3/+31
|\ | | | | | | | | UI: Allow a project variable to be set to an empty value See merge request !9414
| * Fix specslnovy/gitlab-ce-empty-variablesRémy Coutable2017-02-211-17/+11
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * UI: Allow a project variable to be set to an empty valueLukáš Nový2017-02-213-8/+42
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'grapify-ci-triggers-api' into 'master' Rémy Coutable2017-02-222-28/+18
|\ \ | | | | | | | | | | | | Grapfiy the CI::Triggers API See merge request !9439
| * | Grapfiy the CI::Triggers APIgrapify-ci-triggers-apiRobert Schilling2017-02-222-28/+18
| | |
* | | Merge branch '26087-asciidoc-cicd-badges-snippet' into 'master'Rémy Coutable2017-02-225-2/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add AsciiDoc snippet for CI/CD Badges Closes #26087 See merge request !9164
| * | | Add AsciiDoc snippet for CI/CD BadgesJan Christophersen2017-02-205-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds CI/CD Badges Snippets for AsciiDoc as requested in #26087. I've however run into an issue in highlighting the snippet, it seems as if AsciiDoc is currently not being highlighted properly (displayed as plaintext) Add testcase for to_asciidoc Update test case for Badges list
* | | | Merge branch 'dev-docs-ci_docker_build-example_variable_use' into 'master' Rémy Coutable2017-02-221-0/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | docs(ci/docker_build): Add example of variable use See merge request !9159
| * | | | docs(ci/docker_build): Add example of variable useDmitriy Volkov2017-02-211-0/+24
| | | | |
* | | | | Merge branch '22132-rename-branch-name-params-to-branch' into 'master' Rémy Coutable2017-02-2217-53/+1255
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize branch name params as `branch` on V4 API Closes #22132 See merge request !8936
| * | | | | Change branch_name param to branch throughout V4 API22132-rename-branch-name-params-to-branchOswaldo Ferreira2017-02-2117-53/+1255
| | | | | |
* | | | | | Merge branch 'api-subscription-restful' into 'master' Sean McGivern2017-02-2212-49/+190
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Make subscription API more RESTfuL Closes #28327 See merge request !9325
| * | | | | | Update documentationapi-subscription-restfulRobert Schilling2017-02-224-14/+14
| | | | | | |
| * | | | | | API: Make subscription API more RESTfuLRobert Schilling2017-02-219-36/+177
| | | | | | |
* | | | | | | Merge branch 'issue_28051_2' into 'master'Sean McGivern2017-02-223-18/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create compare object with default branch when target branch is missing Closes #28051 See merge request !9263
| * | | | | | | Create compare object with default branch when target branch is missingissue_28051_2Felipe Artur2017-02-213-18/+25
| | | | | | | |
* | | | | | | | Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'Sean McGivern2017-02-2235-247/+935
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spam check and reCAPTCHA improvements Closes #28093 See merge request !9248
| * | | | | | | | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-editOswaldo Ferreira2017-02-2135-247/+935
| | | | | | | | |
* | | | | | | | | Merge branch '28462-fix-delimiter-removes-issue-in-todo-counter' into 'master'Sean McGivern2017-02-223-3/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes delimiter removes when todo marked as done Closes #28462 See merge request !9435
| * | | | | | | | fix rspec issue after delimiter fixNur Rony2017-02-221-1/+1
| | | | | | | | |
| * | | | | | | | fixes delimiter removes when todo marked as doneNur Rony2017-02-222-2/+8
| | | | | | | | |
* | | | | | | | | Merge branch '27287-label-dropdown-error-messages' into 'master'Sean McGivern2017-02-223-32/+43
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix form response errors not shown for create label dropdown. See merge request !9058
| * | | | | | | | fix new label errors not visible in dropdown for #27287, also humanize error ↵Tom Koole2017-02-093-32/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key, improve testing hieararchy for reuse, remove duplicate test
* | | | | | | | | Merge branch 'add-filtered-search-to-mr' into 'master' Alfredo Sumaran2017-02-2221-345/+282
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add filtered search to MR page Closes #27131 See merge request !9284
| * | | | | | | | | Add filtered search to MR pageadd-filtered-search-to-mrClement Ho2017-02-2121-345/+282
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dm-no-more-andor' into 'master'Robert Speicher2017-02-2222-35/+31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No more and/or See merge request !9428
| * | | | | | | | | | No more and/orDouwe Maan2017-02-2122-35/+31
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '26881-backup-fails-if-data-changes' into 'master' Douwe Maan2017-02-213-1/+42
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy data before compression to prevent 'file changed as we read it' Closes #26881 See merge request !8728
| * | | | | | | | | | | # This is a combination of 2 commits.Drew Blessing2017-02-213-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # This is the 1st commit message: Add `copy` backup strategy to combat file changed errors The backup Rake task used to stream data directly from the live data directory into the backup. Under many circumstances this worked OK. However, really active instances would experience a 'file changed as we read it' error - especially with data like the registry. This now copies the data first, then compresses it. It will take a bit more disk space while the backup is in progress, but it's a necessary thing. # The commit message #2 will be skipped: # Add env var
* | | | | | | | | | | | Merge branch '26703-todos-count' into 'master' Clement Ho2017-02-2111-5/+58
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #26703 change todos counter position & format ( for large counts ) Closes #26703 See merge request !9171
| * | | | | | | | | | | change todos counter position & format ( for large counts )mhasbini2017-02-2111-5/+58
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '1363-redo-mailroom-support' into 'master' Douwe Maan2017-02-218-11/+15
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redo internals of Incoming Mail Support See merge request !9385
| * | | | | | | | | | Fix incomming email check task to use same patch we did in mail_room1363-redo-mailroom-supportGabriel Mazetto2017-02-211-2/+5
| | | | | | | | | | |
| * | | | | | | | | | ChangelogGabriel Mazetto2017-02-201-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Use newer mail_room to get `require_relative` supportGabriel Mazetto2017-02-206-9/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'commit-search-ui-fix' into 'master' Annabel Dunstone Gray2017-02-212-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the commit search UI Closes gitlab-ee#1765 See merge request !9411
| * | | | | | | | | | Fix the commit search UIcommit-search-ui-fixPhil Hughes2017-02-212-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1765
* | | | | | | | | | | Merge branch 'zj-upgrade-rails' into 'master'Robert Speicher2017-02-212-46/+43
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Rails to 4.2.8 See merge request !9419
| * | | | | | | | | | | Upgrade Rails to 4.2.8Z.J. van de Weg2017-02-212-46/+43
| | |_|_|/ / / / / / / | |/| | | | | | | | |
View Lorry Controller Status