summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'zj-remove-deprecated-ci-service'zj-remove-deprecated-ci-serviceDouwe Maan2017-02-15199-2781/+6720
|\ | | | | | | # Conflicts: # db/schema.rb
| * 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
| | * | | | | | | | | #27631: Add missing top-area div to activity header pagenerro2017-02-142-7/+12
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'fix-yarn-lock' into 'master' Alfredo Sumaran2017-02-141-101/+238
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix yarn lock and package.json mismatch caused by MR 9133 See merge request !9239
| | * | | | | | | | | | Fix yarn lock and package.json mismatch caused by MR 9133Clement Ho2017-02-141-101/+238
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'issue_27317' into 'master' Alfredo Sumaran2017-02-142-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix timezone on issue boards due date Closes #27317 See merge request !9150
| | * | | | | | | | | | | Fix timezone on issue boards due dateissue_27317Felipe Artur2017-02-142-1/+5
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch '26287-link-branch-in-calendar-activity' into 'master'Rémy Coutable2017-02-142-5/+13
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Links to Branches in Calendar Activity Closes #26287 See merge request !9224
| | * | | | | | | | | | Add Links to Branches in Calendar ActivityJan Christophersen2017-02-142-5/+13
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'fix-yarn-lock-file' into 'master' Filipa Lacerda2017-02-141-3/+129
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync yarn.lock with recent changes to package.json See merge request !9237
| | * | | | | | | | | | sync yarn.lock with recent changes to package.jsonfix-yarn-lock-fileMike Greiling2017-02-141-3/+129
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'cover-my-karma' into 'master' Clement Ho2017-02-146-2/+59
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reintroduce coverage report for JavaScript Closes #27826 and #20757 See merge request !9133
| | * | | | | | | | | | Include all files with 0% coverage in reportwinniehell2017-02-111-0/+35
| | | | | | | | | | | |
| | * | | | | | | | | | Reintroduce coverage report for JavaScript (!9133)winniehell2017-02-115-2/+24
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'requires-input-fixture' into 'master' Clement Ho2017-02-143-24/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for behaviors/requires_input_spec.js See merge request !9162
| | * | | | | | | | | | Replace static fixture for behaviors/requires_input_spec.js (!9162)winniehell2017-02-143-24/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'replace-npm-with-yarn' into 'master' Filipa Lacerda2017-02-146-15/+4345
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace NPM with Yarn See merge request !9055
| | * | | | | | | | | | | add CHANGELOG.md entry for !9055replace-npm-with-yarnMike Greiling2017-02-141-0/+4
| | | | | | | | | | | | |