summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | Return nil as coverage instead of a File objectzj-fix-coverage-bugZ.J. van de Weg2017-04-124-10/+24
| | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given a valid pipeline job, and a regex which wouldn't match to a jobs trace, the stream of the trace would return the File object. This was not the case when it matched a value, as that would have been return from the block. Now the `extract_coverage` method returns `nil` if no match was found.
| * | | | | | | | | | | | | | | Merge branch 'zj-improve-template' into 'master' Sean McGivern2017-04-121-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let uses hide verbose output by default See merge request !10650
| | * | | | | | | | | | | | | | | Let uses hide verbose output by defaultZ.J. van de Weg2017-04-121-0/+8
| | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | Merge branch 'fix/gb/qa/fix-outdated-admin-area-link-title' into 'master' Rémy Coutable2017-04-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix outdated 'Admin area' link label in GitLab QA Closes gitlab-qa#41 See merge request !10646
| | * | | | | | | | | | | | | | Fix outdated 'Admin area' link label in GitLab QAGrzegorz Bizon2017-04-121-1/+1
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | Merge branch 'zj-api-fix-build-events' into 'master' Rémy Coutable2017-04-124-9/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Api fix build events rename to Job events Closes #30412 See merge request !10586
| | * | | | | | | | | | | | | | Fix API not accepting job_events for webhookszj-api-fix-build-eventsZ.J. van de Weg2017-04-124-9/+24
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When renaming, the argument on the projects hook API was forgotten. Now one could successfully set it again. The fix is a little ugly stylewise, but needed as the underlying model still refers to it as build_events. This commit is to fix it, later we should migrate the data to a new column. The edit on the spec file makes sure it passes now, and will fail when we migrate the column.
| * | | | | | | | | | | | | | Merge branch 'grpc-1.2.2' into 'master' Sean McGivern2017-04-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gRPC 1.2.2 Closes #30766 See merge request !10589
| | * | | | | | | | | | | | | | Use gRPC 1.2.2Jacob Vosmaer2017-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes LoadError after local compilation. https://github.com/grpc/grpc/issues/9998
| * | | | | | | | | | | | | | | Merge branch 'siemens/gitlab-ce-fix/subgroup-hide-button' into 'master' Rémy Coutable2017-04-124-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide new subgroup button if user has no permission to create one Closes #30139 See merge request !10627
| | * | | | | | | | | | | | | | | Update changelog with MR idsiemens/gitlab-ce-fix/subgroup-hide-buttonDmitriy Zaporozhets2017-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | | | | | | | Move permission to create subgroup into GroupPolicyDmitriy Zaporozhets2017-04-116-28/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | | | | | | | fix(subgroups): add verification of group creation capability to subgroup UIFabio Huser2017-03-303-1/+27
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-1212-143/+197
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setup and run a Gitaly server for testing if GitalyClient is enabled See merge request !10298
| | * | | | | | | | | | | | | | | | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-1112-143/+197
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch '30457-expire-note-destroy' into 'master'Sean McGivern2017-04-123-1/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue's note cache expiration after delete Closes #30457 See merge request !10461
| | * | | | | | | | | | | | | | | | Fix issue's note cache expiration after deletemhasbini2017-04-113-1/+16
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'bb_save_trace' into 'master' Sean McGivern2017-04-123-6/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [BB Importer] Save the error trace and the whole raw document See merge request !9604
| | * | | | | | | | | | | | | | | [BB Importer] Save the error trace and the whole raw documentbb_save_traceValery Sizov2017-04-113-6/+9
| | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'docs-topic-auth' into 'master' Marcia Ramos2017-04-122-1/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation topic: Authentication Closes #30744 See merge request !10608
| | * | | | | | | | | | | | | | fix conflictdocs-topic-authMarcia Ramos2017-04-1159-215/+829
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | typoMarcia Ramos2017-04-101-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | fix typoMarcia Ramos2017-04-101-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | fix linksMarcia Ramos2017-04-101-2/+2
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | add topic: authenticationMarcia Ramos2017-04-102-2/+48
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-1125-82/+226
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572
| | * | | | | | | | | | | | | | Statisfy Robertcop and Seancopdm-outdated-diff-linkDouwe Maan2017-04-112-10/+4
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add specsDouwe Maan2017-04-105-2/+98
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix specsDouwe Maan2017-04-093-5/+8
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Some code tweaksDouwe Maan2017-04-088-18/+21
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix views after rebaseDouwe Maan2017-04-082-3/+5
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix find_by_diff_refsDouwe Maan2017-04-081-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix specs and make tweaksDouwe Maan2017-04-087-39/+50
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Change discussion headline to 'a now outdated portion of the diff'Douwe Maan2017-04-081-4/+3
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add link to diff header tooDouwe Maan2017-04-082-14/+16
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Cache MR diffs by diff refsDouwe Maan2017-04-082-1/+11
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-0815-39/+63
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch '28017-separate-ce-params-on-api' into 'master' Douwe Maan2017-04-118-30/+122
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API: Separate CE params to avoid wrong conflict resolutions" Closes #28017 See merge request !10484
| | * | | | | | | | | | | | | | Add share_with_group_lock to CE optional params block28017-separate-ce-params-on-apiOswaldo Ferreira2017-04-101-0/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Separate CE params on Grape APIOswaldo Ferreira2017-04-108-30/+121
| | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'removed-notebooklab-absolute-paths' into 'master' Jacob Schatz2017-04-111-215/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed notebooklab code including file paths See merge request !10629
| | * | | | | | | | | | | | | | Fixed notebooklab code including file pathsremoved-notebooklab-absolute-pathsPhil Hughes2017-04-111-215/+32
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'update-doc-installation-and-upgrade' into 'master' Robert Speicher2017-04-112-7/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation and upgrading guides [ci skip] See merge request !10621
| | * | | | | | | | | | | | | | Update documents according to:update-doc-installation-and-upgradeLin Jen-Shin2017-04-112-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#step-1-update-the-installation-from-source-guide In step 1 and step 2
| * | | | | | | | | | | | | | | Merge branch '30636-fix-blame-edit-blob-without-repo-permissions' into 'master' Annabel Dunstone Gray2017-04-112-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Edit" button on blame page without repo permissions Closes #30636 See merge request !10598
| | * | | | | | | | | | | | | | | Fix edit button on blame page without repo perms30636-fix-blame-edit-blob-without-repo-permissionsEric Eastwood2017-04-102-7/+7
| | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without repo permissions, pressing the "Edit" button on the blame page will now prompt to Fork/Cancel. Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30636
| * | | | | | | | | | | | | | | Merge branch 'update-licenses.csv' into 'master' Robert Speicher2017-04-111-146/+322
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update licenses.csv [ci skip] See merge request !10620
| | * | | | | | | | | | | | | | Update licenses.csv via:update-licenses.csvLin Jen-Shin2017-04-111-146/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | license_finder report --format=csv --save=vendor/licenses.csv
| * | | | | | | | | | | | | | | Merge branch 'gitlab-update_templates' into 'master'Robert Speicher2017-04-1114-70/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates See merge request !10619
| | * | | | | | | | | | | | | | | Update templates via:gitlab-update_templatesLin Jen-Shin2017-04-1114-70/+68
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rake gitlab:update_templates