summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removed extra activity update for new projectscreate-project-performanceYorick Peterse2015-10-291-2/+0
| | | | | When a project is created the last activity timestamp is already set so there's no need for another update.
* Added benchmark for Projects::CreateServiceYorick Peterse2015-10-291-0/+28
| | | | | This benchmark currently runs at ~0.6 iterations per second and is unlikely to perform any better any time soon.
* Added index on services.templateYorick Peterse2015-10-292-0/+6
| | | | | This column is queried when creating a new project, without an index this query would lead to a sequence scan.
* Merge branch 'shared-file-access' into 'master' Dmitriy Zaporozhets2015-10-295-1/+43
|\ | | | | | | | | | | | | Start putting shared files in "shared" See merge request !1691
| * Clarify puppiesshared-file-accessJacob Vosmaer2015-10-261-2/+2
| |
| * Start putting shared files in "shared"Jacob Vosmaer2015-10-265-1/+43
| |
* | Write out internet explorerSytse Sijbrandij2015-10-291-1/+1
| |
* | IE message doesn't need a headingSytse Sijbrandij2015-10-291-5/+1
| |
* | Merge branch 'closing-issue-tracker' into 'master' Dmitriy Zaporozhets2015-10-281-0/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add copy paste text for closing down the Github issue tracker @sytses I think we talked about closing down the Issue tracker on Github. A first step can be closing all the older issues and steering people towards the gitlab.com issue tracker. What do you think about this text? See merge request !1689
| * | Add copy paste text for closing down the Github issue trackerclosing-issue-trackerJeroen van Baarsen2015-10-281-0/+7
| | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Merge branch 'edit-new-cross-references' into 'master' Dmitriy Zaporozhets2015-10-280-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use issue editor as cross reference comment author when issue is edited with a new mention. Fixes #3244. See merge request !1696
* \ \ \ Merge branch 'rs-update-nprogress-rails' into 'master' Dmitriy Zaporozhets2015-10-282-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump nprogress-rails to 0.1.6.7 Closes #2866 See merge request !1686
| * | | | Bump nprogress-rails to 0.1.6.7rs-update-nprogress-railsRobert Speicher2015-10-262-3/+3
| | | | | | | | | | | | | | | | | | | | Closes #2866
* | | | | Merge branch 'edit-new-cross-references'Dmitriy Zaporozhets2015-10-284-3/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Use issue editor as cross reference comment author when issue is edited with ↵edit-new-cross-referencesDouwe Maan2015-10-284-3/+4
| | | | | | | | | | | | | | | | | | | | a new mention.
* | | | | Merge branch 'cleanup-ci-integration' into 'master' Dmitriy Zaporozhets2015-10-288-83/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated CI events from project settings page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @ayufan Part of #2594 See merge request !1694
| * | | | | Remove deprecated CI events from project settings pageDmitriy Zaporozhets2015-10-288-83/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'fix_permission_doc' into 'master' Achilleas Pipinellis2015-10-281-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the permission doc The guest users was missing "Pull project code" and "Download project". /cc @axil See merge request !1695
| * | | | | Fixed the permission docHannes Rosenögger2015-10-281-2/+2
| | |/ / / | |/| | | | | | | | | | | | | The guest users was missing "Pull project code" and "Download project".
* | | | | Merge branch 'gitlab-shell-v2.6.6' into 'master' Dmitriy Zaporozhets2015-10-282-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab-shell to v2.6.6 See merge request !1673
| * | | | Bump gitlab-shell to v2.6.6Artem V. Navrotskiy2015-10-222-2/+2
| | | | |
* | | | | Merge branch 'rs-update-jquery-atwho-rails' into 'master' Dmitriy Zaporozhets2015-10-272-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump jquery-atwho-rails to ~> 1.3.2 Closes #2858 See merge request !1687
| * | | | | Bump jquery-atwho-rails to ~> 1.3.2rs-update-jquery-atwho-railsRobert Speicher2015-10-262-3/+3
| | |/ / / | |/| | | | | | | | | | | | | Closes #2858
* | | | | Merge branch 'add-project-path-index' into 'master' Robert Speicher2015-10-272-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add projects path index Fixes performance regression introduced by !1649 See merge request !1692
| * | | | | Add projects path indexadd-project-path-indexKamil Trzcinski2015-10-262-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | Fixes performance regression introduced by MR1649
* | | | | | Merge branch 'builds_to_backup_doc' into 'master' Kamil Trzciński2015-10-271-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add builds to the docs as a valid skip option for backups. See merge request !1666
| * | | | | Add builds to the docs as a valid skip option for backups.builds_to_backup_docMarin Jankovski2015-10-221-1/+1
| | | | | |
* | | | | | Merge pull request #9771 from kazubu/fix_error_destroy_without_refererStan Hu2015-10-262-5/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix: 500 error returned if destroy request without HTTP referer
| * | | | | | modify to use redirect_back_or_default functionkazubu2015-10-261-5/+1
| | | | | | |
| * | | | | | Fix: 500 error returned if destroy request without HTTP refererkazubu2015-10-262-1/+2
| | |/ / / / | |/| | | |
* | | | | | Update CHANGELOG for 8.1.1Robert Speicher2015-10-261-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'fix-ci-badge' into 'master' Robert Speicher2015-10-264-15/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI badge The previous code relied on having on ref stored in commit, however the ref was moved to the build. Fixes #3104 See merge request !1690
| * | | | | | Fix CI badgefix-ci-badgeKamil Trzcinski2015-10-264-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code relied on having on ref stored in commit, however the ref was moved to the build.
* | | | | | | Merge branch 'fix-specific-runner-visibility' into 'master' Robert Speicher2015-10-264-14/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Fix visibility of specific runners See merge request !1688
| * | | | | | Fix specific runner visibilityKamil Trzcinski2015-10-264-14/+20
| |/ / / / /
* | | | | | Merge branch 'remove-satellites' into 'master' Robert Speicher2015-10-264-4/+25
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Add migration to remove the contents of the satellites dir See merge request !1681
| * | | | | Remove the contents of the satellites dirremove-satellitesJacob Vosmaer2015-10-234-4/+25
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-10-2612-12/+47
|\ \ \ \ \
| * \ \ \ \ Merge branch 'dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses'Douwe Maan2015-10-253-4/+4
| |\ \ \ \ \
| | * | | | | Fix issue #3055 (project search with unmatched parentheses)dirceu/gitlab-ce-fix-project-search-with-unmatched-parenthesesDirceu Pereira Tiegs2015-10-213-4/+4
| | | | | | |
| * | | | | | Merge branch 'ci-status-mr-index' into 'master' Dmitriy Zaporozhets2015-10-259-8/+43
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci status for merge requests index page ![ci-mr-index](/uploads/1424564c87ac6ff5fb2c4bc260fbebdf/ci-mr-index.png) See merge request !1682
| | * | | | | | Fix rubocop issuesci-status-mr-indexDmitriy Zaporozhets2015-10-232-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Move rendering CI status to helperDmitriy Zaporozhets2015-10-234-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Add tests for MR index pageDmitriy Zaporozhets2015-10-233-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Render CI status on merge requests index pageDmitriy Zaporozhets2015-10-234-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge pull request #9769 from jannickfahlbusch/fixTyposStan Hu2015-10-264-7/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix some grammatical issues
| * | | | | | | Fix some grammatical issuesJannick Fahlbusch2015-10-244-7/+6
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'github/master'Robert Speicher2015-10-241-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #9767 from jannickfahlbusch/patch-1Robert Schilling2015-10-241-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Add missing character
| | * | | | | | Add missing characterJannick Fahlbusch2015-10-231-1/+1
| |/ / / / / / | | | | | | | | | | | | | | This adds the missing character `a` to the help-text
View Lorry Controller Status