summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ability to skip some items in backupbackup_skip_optionValery Sizov2015-04-025-15/+119
|
* Merge branch 'rs-icon-symlink' into 'master'Douwe Maan2015-04-022-2/+2
|\ | | | | | | | | | | | | | | Check symlink mode as a String for file_type_icon_class The file mode for a symlink just got changed in `gitlab_git`, see https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69 See merge request !487
| * Check symlink mode as a String for file_type_icon_classRobert Speicher2015-04-012-2/+2
| | | | | | | | See https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
* | Update CHANGELOG.Marin Jankovski2015-04-021-5/+4
| |
* | Update changelog for 7.9.2.Marin Jankovski2015-04-021-0/+2
|/
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2015-03-312-2/+2
|\
| * Merge branch 'no-chmod-r' into 'master'Dmitriy Zaporozhets2015-04-012-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | Don't use chmod_R for backup tars When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents. See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1716#note_40472 See merge request !1744
| | * Don't use chmod_R for backup tarsVinnie Okada2015-03-282-2/+2
| | | | | | | | | | | | | | | When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents.
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-3121-101/+263
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/markdown.rb
| * \ \ Merge branch 'rs-issue-1340' into 'master'Dmitriy Zaporozhets2015-04-012-12/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unbind task item checkbox events and then rebind them Fixes #1340 This issue was caused by this line: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/projects/issues/update.js.haml#L17 `new Issue()` gets called on every JS-based issue update, and all the binds in the constructor get re-applied without first unbinding the existing ones. Right now my fix is *only* for the checkbox events, and I suspect there are similar issues still present for other events. See merge request !478
| | * | | Unbind task item checkbox events and then rebind themRobert Speicher2015-03-312-12/+4
| | | | | | | | | | | | | | | | | | | | Fixes #1340
| * | | | Merge branch 'group-information-leak' into 'master'Dmitriy Zaporozhets2015-04-015-7/+137
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't leak private group existence by redirecting from namespace controller to group controller. See merge request !440
| | * | | | Add tests.group-information-leakDouwe Maan2015-03-271-0/+121
| | | | | |
| | * | | | Don't leak private group existence by redirecting from namespace controller ↵Douwe Maan2015-03-244-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | to group controller.
| * | | | | Merge branch 'admin-user-projects' into 'master'Dmitriy Zaporozhets2015-04-014-5/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix admin user projects lists. The admin user personal projects lists wasn't being rendered anymore. cc @marin See merge request !442
| | * | | | | Fix admin user projects lists.admin-user-projectsDouwe Maan2015-03-314-5/+8
| | |/ / / /
| * | | | | Merge branch 'refactor-milestones' into 'master'Dmitriy Zaporozhets2015-04-017-57/+62
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better looking milestone lists ### Before ![milestone-before](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1366ade74d76b067fdc8707d31d2bffc/milestone-before.png) ### After ![milestone-after](https://gitlab.com/gitlab-org/gitlab-ce/uploads/80ae1c1f77eae5dff8ee61c4271bec17/milestone-after.png) See merge request !484
| | * | | | Better looking milestone listsDmitriy Zaporozhets2015-04-017-57/+62
| | | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-013-5/+36
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'file-commit-list' into 'master'Douwe Maan2015-03-311-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue where only 25 commits would load in file listings Fixes #1310 See https://gitlab.com/gitlab-org/gitlab-ce/tree/master and it will only show the first 25 files commit messages. See merge request !477
| | | * | | | Fixed issue where only 25 commits would load in file listingsPhil Hughes2015-03-301-1/+1
| | | | | | |
| | * | | | | Merge branch 'doc_issue_closing' into 'master'Robert Schilling2015-03-312-4/+35
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Update documentation on issue closing pattern. See merge request !475
| | | * | | | Missing dot.Achilleas Pipinellis2015-03-301-1/+1
| | | | | | |
| | | * | | | Update documentation on issue closing pattern.Achilleas Pipinellis2015-03-302-3/+34
| | | | | | |
| * | | | | | Merge pull request #9023 from dantudor/patch-1Dmitriy Zaporozhets2015-03-311-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Allow ability to delete branches with '/` in name
| | * | | | | Added the missing commaDan Tudor2015-03-311-1/+1
| | | | | | |
| | * | | | | Allow ability to delete branches with '/` in nameDan Tudor2015-03-251-3/+3
| | | | | | |
* | | | | | | Merge branch 'email-full-url'Marin Jankovski2015-03-3112-64/+117
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use relative URL for Markdown references, except in mails.email-full-urlDouwe Maan2015-03-2711-58/+111
| | | | | | |
| * | | | | | Return full URLs from GitLabIssueTrackerService.Douwe Maan2015-03-274-19/+19
| | | | | | |
* | | | | | | Better legend for contribution calendar pt2 :)Dmitriy Zaporozhets2015-03-311-1/+1
| | | | | | |
* | | | | | | Better legend for contribution calendarDmitriy Zaporozhets2015-03-311-3/+3
| | | | | | |
* | | | | | | Merge branch 'commits-count-badge' into 'master'Dmitriy Zaporozhets2015-03-301-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added badge to commits tab Fixes #1261 See merge request !465
| * | | | | | | Added badge to commits tabPhil Hughes2015-03-301-1/+3
| | | | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-303-2/+5
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'events-paginate' into 'master'Douwe Maan2015-03-302-1/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Events paginate Updated the api method for /project/:id/events, to use the paginate method instead of limiting and offsetting the recent events in the method itself. This will also change the first page to be 1 instead of 0, but using 0 will still work and will give back the first page. This also add's the link headers (next/first/last). See merge request !267
| | * | | | | | Updated api method GET /projects/:id/events to use paginate instead of a ↵Stephan van Leeuwen2015-03-242-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | self-implementation Also updated example request url Added changelog item
| * | | | | | | Merge branch 'upgrade-dockerfile-7.9.1' into 'master'Achilleas Pipinellis2015-03-301-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Docker build to GitLab v7.9.1 Upgrade GitLab from v7.9.0 to v7.9.1. See merge request !476
| | * | | | | | | Bump Docker build to GitLab v7.9.1Stan Hu2015-03-301-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-302-7/+10
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #9056 from mavimo/patch-3Dmitriy Zaporozhets2015-03-301-6/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix merge errors on CHANGELOG
| | * | | | | | | | Fix merge errors on CHANGELOGMarco Vito Moscaritolo2015-03-301-6/+9
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | During merges (d554070a and 497fd75d) changelog was "damaged", I restored the tagged 7.9.1 and added the required changes about 7.10.0 (unreleased). I think we need to ensure all PR are rebased on master before merge.
| * | | | | | | | Merge pull request #9053 from firstrow/patch-1Robert Schilling2015-03-301-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | LICENSE year update
| | * | | | | | | LICENSE year updateAndrew2015-03-301-1/+1
| |/ / / / / / /
* | | | | | | | Fix adding new members to groupDmitriy Zaporozhets2015-03-303-1/+35
|/ / / / / / /
* | | | | | | Include brakeman in rake testDmitriy Zaporozhets2015-03-291-0/+1
| | | | | | |
* | | | | | | Refactor star btn logic for non-logged in user and fix testsDmitriy Zaporozhets2015-03-294-17/+26
| | | | | | |
* | | | | | | Refactor star/fork buttonsDmitriy Zaporozhets2015-03-295-24/+47
| | | | | | |
* | | | | | | Merge branch 'file-type' of https://github.com/Soullivaneuh/gitlabhq into ↵Dmitriy Zaporozhets2015-03-299-8/+171
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Soullivaneuh-file-type
| * | | | | | | Improve file icons rendering on treeSullivan SENECHAL2015-03-289-8/+171
| | | | | | | |
View Lorry Controller Status