summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove empty new-nav.scssremove-empty-scss-fileAnnabel Dunstone Gray2017-11-271-0/+0
|
* Merge branch 'backport-add-epic-sidebar' into 'master'Fatih Acet2017-11-2717-9/+852
|\ | | | | | | | | Backport of add-epic-sidebar See merge request gitlab-org/gitlab-ce!15335
| * Update text_utility.jsClement Ho2017-11-171-1/+1
| |
| * Fix potential EE conflictbackport-add-epic-sidebarClement Ho2017-11-162-10/+10
| |
| * Merge branch 'master' into 'backport-add-epic-sidebar'Clement Ho2017-11-15157-1830/+3085
| |\ | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/text_utility.js
| * \ Merge branch 'master' into backport-add-epic-sidebarClement Ho2017-11-1398-479/+2787
| |\ \
| * | | Backport of add-epic-sidebarClement Ho2017-11-1017-14/+849
| | | |
* | | | Merge branch '39601-create-issuable-destroy-service' into 'master'Rémy Coutable2017-11-278-5/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create issue and merge request destroy services Closes #39601 See merge request gitlab-org/gitlab-ce!15604
| * | | | Create issue and merge request destroy servicesGeorge Andrinopoulos2017-11-258-5/+59
| | | | |
* | | | | Merge branch 'patch-29' into 'master'Rémy Coutable2017-11-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add in the Oxford comma See merge request gitlab-org/gitlab-ce!15602
| * | | | | Add in the Oxford commaDavid Muckle2017-11-251-1/+1
| |/ / / /
* | | | | Merge branch '40273_404_on_commits_page_when_all_files_on_branch_deleted' ↵Rémy Coutable2017-11-271-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix 404 on commits list for branch that doesn't have any files See merge request gitlab-org/gitlab-ce!15603
| * | | | | Fix 404 on empty branchhaseeb2017-11-271-2/+1
|/ / / / /
* | | | | Merge branch 'optimise-stuck-ci-jobs-worker' into 'master'Yorick Peterse2017-11-275-14/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise StuckCiJobsWorker Closes gitlab-com/infrastructure#3260 See merge request gitlab-org/gitlab-ce!15527
| * | | | | Fix stuck jobs testsoptimise-stuck-ci-jobs-workerKamil Trzcinski2017-11-271-4/+4
| | | | | |
| * | | | | Allow to drop jobs for deleted projectsKamil Trzcinski2017-11-274-10/+13
| | | | | |
| * | | | | Use not-ordered searchKamil Trzcinski2017-11-271-4/+9
| | | | | |
| * | | | | Optimise StuckCiJobsWorkerKamil Trzcinski2017-11-272-3/+13
|/ / / / /
* | | | | Merge branch '40481-bump-jquery-to-2-2-4' into 'master'Phil Hughes2017-11-275-11/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade jQuery to 2.2.4 Closes #40481 See merge request gitlab-org/gitlab-ce!15570
| * | | | | Upgrade jQuery to 2.2.4Takuya Noguchi2017-11-235-11/+16
| | | | | |
* | | | | | Merge branch 'fix_schedules_documentation' into 'master'Grzegorz Bizon2017-11-271-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed 'only once' from the docs Closes #39261 See merge request gitlab-org/gitlab-ce!15601
| * | | | | | removed 'only once' from the docsChristiaan Van den Poel2017-11-251-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch '40352-ignore-hashed-repos-cleanup-dirs' into 'master'Stan Hu2017-11-264-12/+51
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignore hashed repositories when doing rake gitlab:cleanup:dirs Closes #40352 See merge request gitlab-org/gitlab-ce!15600
| * | | | | static-analysis fix40352-ignore-hashed-repos-cleanup-dirsdigitalMoksha2017-11-251-2/+1
| | | | | |
| * | | | | refactored the hashed repository namedigitalMoksha2017-11-251-2/+5
| | | | | |
| * | | | | static analysis fixdigitalMoksha2017-11-241-1/+0
| | | | | |
| * | | | | added changelogdigitalMoksha2017-11-242-0/+10
| | | | | |
| * | | | | ignore hashed repositories when doing rake gitlab:cleanup:dirsdigitalMoksha2017-11-242-11/+39
| | | | | |
* | | | | | Merge branch 'fl-upgrade-svg' into 'master'Tim Zallmann2017-11-2433-15/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update svg external dependency See merge request gitlab-org/gitlab-ce!15596
| * | | | | | Update svg external dependencyfl-upgrade-svgFilipa Lacerda2017-11-2433-15/+40
| | | | | | |
* | | | | | | Merge branch 'docs/runner-aws-spot-instances' into 'master'Marcia Ramos2017-11-242-0/+411
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add article on autoscaling GitLab Runner on AWS Closes #39650 See merge request gitlab-org/gitlab-ce!15313
| * | | | | | | Address feedback for AWS Runner autoscale articleAchilleas Pipinellis2017-11-242-118/+142
| | | | | | | |
| * | | | | | | Clarify usage of Runner limit and AWS tagsAchilleas Pipinellis2017-11-231-4/+6
| | | | | | | |
| * | | | | | | Finish rest of the sectionsAchilleas Pipinellis2017-11-231-56/+147
| | | | | | | |
| * | | | | | | Finish all sections except docker.machineAchilleas Pipinellis2017-11-231-14/+44
| | | | | | | |
| * | | | | | | Add runners.cache sectionAchilleas Pipinellis2017-11-231-72/+90
| | | | | | | |
| * | | | | | | Add Runner registration infoAchilleas Pipinellis2017-11-231-5/+89
| | | | | | | |
| * | | | | | | Clear up sectionsAchilleas Pipinellis2017-11-231-20/+53
| | | | | | | |
| * | | | | | | Add skeletonAchilleas Pipinellis2017-11-232-1/+115
| | | | | | | |
| * | | | | | | Add article on autoscaling GitLab Runner on AWSAchilleas Pipinellis2017-11-231-0/+15
| | | | | | | |
* | | | | | | | Merge branch 'pawel/update_prometheus_gem_to_fix_compilation_on_centos' into ↵Stan Hu2017-11-242-3/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update prometheus Gem to fix compilation on centos 6 due to GCC not recognizing `std=c11` option Closes omnibus-gitlab#2988 See merge request gitlab-org/gitlab-ce!15598
| * | | | | | | Update prometheus Gem to fix compilation on centos 6 duo to GCC not ↵Pawel Chojnacki2017-11-242-3/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | recognizing `std=c11` option
* | | | | | | Merge branch 'jej/fix-protected-branch-validations-ce' into 'master'Rémy Coutable2017-11-248-42/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ProtectedBranch access level validations See merge request gitlab-org/gitlab-ce!15586
| * | | | | | | Deduplicate protected ref human_access_levelsjej/fix-protected-branch-validations-ceJames Edwards-Jones2017-11-246-25/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously these were duplicated so they could be different for push/merge, but this was no longer necessary after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11232
| * | | | | | | Fix ProtectedBranch access level validationsJames Edwards-Jones2017-11-245-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before an access_level was required in EE even when an it had been set for a user/group.
* | | | | | | | Merge branch 'dm-project-search-performance' into 'master'Sean McGivern2017-11-246-44/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drastically improve project search performance by no longer searching namespace name Closes #40510 and #39623 See merge request gitlab-org/gitlab-ce!15590
| * | | | | | | | Drastically improve project search performance by no longer searching ↵dm-project-search-performanceDouwe Maan2017-11-246-44/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace name
* | | | | | | | | Merge branch 'qa/gb/add-feedback-to-package-qa-action' into 'master'Rémy Coutable2017-11-242-20/+91
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a feedback mechanism to `package-qa` manual action Closes #40431 See merge request gitlab-org/gitlab-ce!15538
| * | | | | | | | Add a feedback mechanism to `package-qa` manual actionGrzegorz Bizon2017-11-242-20/+91
|/ / / / / / / /
* | | | | | | | Merge branch '40465-update-timeago-js' into 'master'Filipa Lacerda2017-11-242-4/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update timeago.js" Closes #40465 See merge request gitlab-org/gitlab-ce!15553