summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '26651-cannot-move-project-into-group' into 'master' 27950-ci-status-checkRémy Coutable2017-02-152-1/+5
|\ | | | | | | | | | | | | Specify that only project owners can transfer a project Closes #26651 See merge request !9262
| * Specify that only project owners can transfer a projectMark Fletcher2017-02-152-1/+5
| | | | | | | | [skip ci]
* | Merge branch 'add-missing-api-entities' into 'master'Rémy Coutable2017-02-156-26/+74
|\ \ | | | | | | | | | | | | | | | | | | Add missing api entities Closes #23895 See merge request !7138
| * | entities: use the RepoCommit entity for branch commitsBen Boeckel2017-02-146-26/+74
| | | | | | | | | | | | Fixes #23895.
* | | Merge branch 'fix-production-assets' into 'master' Alfredo Sumaran2017-02-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Only load istanbul plugin in development mode See merge request !9261
| * | | only load istanbul plugin in development modeMike Greiling2017-02-151-1/+1
| | | |
* | | | Merge branch 'no-more-moment' into 'master' Alfredo Sumaran2017-02-155-5/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Stop Pikaday using moment See merge request !9244
| * | | | Stop Pikaday using momentno-more-momentPhil Hughes2017-02-145-5/+10
| | | | |
* | | | | Merge branch 'fix/gb/notification-settings-when-no-repository' into 'master' Douwe Maan2017-02-153-4/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show notifications settings even when repository feature is disabled See merge request !9180
| * | | | | Add Changelog entry for notifications buttons fixfix/gb/notification-settings-when-no-repositoryGrzegorz Bizon2017-02-131-0/+4
| | | | | |
| * | | | | Improve home panel partial code and view specsGrzegorz Bizon2017-02-132-7/+7
| | | | | |
| * | | | | Show notifications settings when repository is disabledGrzegorz Bizon2017-02-132-1/+41
| | | | | |
* | | | | | Remove changelog entries for 8.16.5 releaseRobert Speicher2017-02-154-16/+0
| | | | | |
* | | | | | Merge branch 'fix-github-import-MR-wrong-project' into 'security' Robert Speicher2017-02-152-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix labels being applied to wrong merge requests on GitHub import See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064
* | | | | | Merge branch 'svg-xss-fix' into 'security' Robert Speicher2017-02-155-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for XSS vulnerability in SVG attachments See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2059
* | | | | | Merge branch 'fix-rdoc-xss' into 'security' Robert Speicher2017-02-153-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix XSS in rdoc and other markups See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2058
* | | | | | Merge branch 'asciidoctor-xss-patch' into 'security' Robert Speicher2017-02-153-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sanitization filter to asciidocs output to prevent XSS See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2057
* | | | | | Merge branch '28229-pipelines-loading-icon' into 'master' Annabel Dunstone Gray2017-02-152-2/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Centers loading icon vertically and horizontally in pipelines table in commit view Closes #28229 See merge request !9256
| * | | | | Centers loading icon vertically and horizontally in pipelines table in ↵28229-pipelines-loading-iconFilipa Lacerda2017-02-152-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | commit view
* | | | | | Merge branch 'create-new-project-ui-fix' into 'master' Dmitriy Zaporozhets2017-02-153-9/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layout alignment fix in new project and edit project screen See merge request !9201
| * | | | | | Layout alignment fix in new project and edit project screenPratik Borsadiya2017-02-133-9/+5
| | | | | | |
* | | | | | | Merge branch 'issue_25112' into 'master' Sean McGivern2017-02-153-1/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable invalid service templates Closes #25112 See merge request !8850
| * | | | | | | Disable invalid service templatesissue_25112Felipe Artur2017-02-143-1/+20
| | | | | | | |
* | | | | | | | Merge branch 'docs/builds-to-jobs-massacre' into 'master' Achilleas Pipinellis2017-02-1563-773/+789
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Rename builds to jobs in docs See merge request !9204
| * | | | | | | Rename builds to jobs in docsAchilleas Pipinellis2017-02-1563-773/+789
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch '27925-fix-mr-stray-pipelines-api-request' into 'master' Filipa Lacerda2017-02-156-8/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix stray pipelines API request when showing MR Closes #27925 See merge request !9213
| * | | | | | | | Fix stray pipelines API request when showing MR27925-fix-mr-stray-pipelines-api-requestEric Eastwood2017-02-146-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27925
* | | | | | | | | Merge branch 'not_ignore_parameter_of_mr_change_branches_path' into 'master'Rémy Coutable2017-02-151-4/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Don't ignore the parameter of MergeRequestsHelper#mr_change_branches_path See merge request !9223
| * | | | | | | | Don't ignore the parameter of MergeRequestsHelper#mr_change_branches_pathDongqing Hu2017-02-141-4/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'dz-nested-groups-improvements-3' into 'master' Dmitriy Zaporozhets2017-02-1527-59/+103
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nested groups improvements pt 3 See merge request !9227
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ↵dz-nested-groups-improvements-3Dmitriy Zaporozhets2017-02-1411-111/+443
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | dz-nested-groups-improvements-3
| * | | | | | | | | Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-1474-1906/+5344
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # doc/api/projects.md
| * | | | | | | | | | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-1422-53/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Expose Namespace#full_path in namespaces APIDmitriy Zaporozhets2017-02-145-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'pass_coverage_value_to_commit_status_api' into 'master' Rémy Coutable2017-02-155-2/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to pass coverage value to commit status API Closes #27807 See merge request !9214
| * | | | | | | | | | add changelogwendy04022017-02-141-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Make it possible to pass coverage value to commit status APIwendy04022017-02-144-2/+8
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Remove duplicate CHANGELOG.md entries for 8.16.5Robert Speicher2017-02-141-2/+0
| | | | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2017-02-141-0/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update CHANGELOG.md for 8.14.9Robert Speicher2017-02-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | Update CHANGELOG.md for 8.15.6Robert Speicher2017-02-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | Update CHANGELOG.md for 8.16.5Robert Speicher2017-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | Update CHANGELOG.md for 8.16.5Robert Speicher2017-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | Update CHANGELOG.md for 8.16.5Robert Speicher2017-02-141-0/+7
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch '27759-fix-sidekiq_status-client_middleware-issue' into 'master' Robert Speicher2017-02-142-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SidekiqStatus need to be qualified in some cases Closes #27759 See merge request !9235
| * | | | | | | | | | SidekiqStatus need to be qualified in some cases27759-fix-sidekiq_status-client_middleware-issueRémy Coutable2017-02-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch '28142-overlap-bugs' into 'master' Alfredo Sumaran2017-02-143-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix z index bugs Closes #28142 See merge request !9236
| * | | | | | | | | | | Add changelog28142-overlap-bugsAnnabel Dunstone Gray2017-02-141-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Fix z index bugsAnnabel Dunstone Gray2017-02-142-1/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into 'master' Clement Ho2017-02-142-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix smaller height of Activity header page Closes #27631 See merge request !8952