summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve user calendar testimprove-contributions-calendarDmitriy Zaporozhets2015-03-221-3/+1
|
* Improve contribution calendar per day infoDmitriy Zaporozhets2015-03-224-30/+5
|
* Update CHANGELOG with contribution calendarDmitriy Zaporozhets2015-03-221-0/+1
|
* Contribution calendar will use events instead of commits to count contributionsDmitriy Zaporozhets2015-03-223-14/+12
|
* Refactor contributions events and write tests for calendarDmitriy Zaporozhets2015-03-227-18/+59
|
* Fix user controller specsDmitriy Zaporozhets2015-03-221-17/+4
|
* Refactor repository specsDmitriy Zaporozhets2015-03-221-38/+7
|
* Replace commits calendar with contributions calendarDmitriy Zaporozhets2015-03-218-155/+104
| | | | | | * count opening of issues and merge requests * dont trigger git repository - use events from database * much-much faster since does not affected by repository size
* Merge branch 'improve-profile' into 'master'Dmitriy Zaporozhets2015-03-2218-54/+59
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Improve profile ### OLD ![old-oauth](https://gitlab.com/gitlab-org/gitlab-ce/uploads/86f4b19d4e4cc9cf2705400428541a82/old-oauth.png) ### NEW ![profile](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c480372e66af579ce355d5c215669296/profile.png) See merge request !418
| * Restyle oauth accounts at profile page and add ability to unlink accountimprove-profileDmitriy Zaporozhets2015-03-2111-54/+59
| |
| * Remove 32px oauth imagesDmitriy Zaporozhets2015-03-217-0/+0
|/
* Merge branch 'backup-permissions' into 'master'Dmitriy Zaporozhets2015-03-213-25/+82
|\ | | | | | | | | | | | | | | | | | | | | | | Change permissions on backup files - #2 Use more restrictive permissions for backup tar files and for the db, uploads, and repositories directories inside the tar files. See #1894. Now the backup task recursively `chmod`s the `db/`, `uploads/`, and `repositories/` folders with 0700 permissions, and the tar file is created as 0600. This is a followup to !1703, which was reverted because it broke Rspec tests. The test failures were due to the rake task changing directories and not changing back, which I fixed with this commit. cc @sytse See merge request !1716
| * Call chdir() with a blockVinnie Okada2015-03-191-18/+17
| |
| * Move backup permission changes to version 7.10Vinnie Okada2015-03-191-1/+1
| |
| * Change permissions on backup filesVinnie Okada2015-03-173-12/+70
| | | | | | | | | | Use more restrictive permissions for backup tar files and for the db, uploads, and repositories directories inside the tar files.
* | Merge branch 'add-sidetiq' into 'master'Dmitriy Zaporozhets2015-03-213-0/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sidetiq dependency Add the sidetiq gem to the Gemfile to match EE. See #2159. cc @sytse See merge request !1734
| * | Add sidetiq dependencyVinnie Okada2015-03-213-0/+8
| | | | | | | | | | | | Add the sidetiq gem to the Gemfile to match EE.
* | | Merge branch 'topic/push_tag_events_for_ci' of ↵Dmitriy Zaporozhets2015-03-217-45/+97
|\ \ \ | | | | | | | | | | | | https://github.com/ayufan/gitlabhq into ayufan-topic/push_tag_events_for_ci
| * | | Extend push_tag event to include tag message and last commitKamil Trzcinski2015-03-217-45/+97
| |/ /
* | | Merge branch 'performance-tune' into 'master'Dmitriy Zaporozhets2015-03-212-3/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance improvements * Cache project branches and tags into variables * Cache lookup results into hash to prevent repeating same requests to git repo * Cache head commit and head tree See merge request !417
| * | | Cache head commit and head treeDmitriy Zaporozhets2015-03-211-2/+10
| | | |
| * | | Cache lookup results into hash to prevent repeating same requests to git repoDmitriy Zaporozhets2015-03-211-1/+10
| | | |
| * | | Cache project branches and tags into variablesDmitriy Zaporozhets2015-03-212-0/+17
| |/ /
* | | Add CHANGELOG item with print view fixDmitriy Zaporozhets2015-03-211-0/+1
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-211-0/+4
|\ \ \
| * \ \ Merge branch 'fix-print-css' into 'master'Dmitriy Zaporozhets2015-03-211-0/+4
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Hide UI elements when print md files or wiki pages Fixes #1023 See merge request !416
| | * | Hide UI elements when print md files or wiki pagesfix-print-cssDmitriy Zaporozhets2015-03-211-0/+4
| |/ /
* | | Merge branch 'fix-upgrade-guide' into 'master'Dmitriy Zaporozhets2015-03-212-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link in patch update guide Use an absolute URL to gitlab.com's master branch instead of a relative URL on the local instance. Also change which words are include in the anchor element, since the Markdown parser doesn't seem to like backticks inside the link text. ### Before ![update_link_before](https://dev.gitlab.org/Okada/gitlabhq/uploads/f6a8b2aa06ca210d5ea8a8b28a78c30c/update_link_before.png) ### After ![update_link_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/6df92b3f5d8ffd6906bdc62cf19acb11/update_link_after.png) cc @sytse See merge request !1735
| * | Fix link in patch update guideVinnie Okada2015-03-212-1/+2
|/ /
* | Merge branch 'improve-avatar-header' into 'master'Dmitriy Zaporozhets2015-03-215-30/+45
|\ \ | | | | | | | | | | | | | | | | | | | | | Improve header with avatar for group and user pages Nice looking and aligned headers for user and group pages See merge request !412
| * | Improve header with avatar for group and user pagesDmitriy Zaporozhets2015-03-205-30/+45
| | |
* | | Prevent diff header overflowDmitriy Zaporozhets2015-03-201-1/+3
|/ /
* | Merge branch 'user-location' into 'master'Dmitriy Zaporozhets2015-03-217-2/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Location field in user profile Twitter allows you to set string with location information. I find it very useful in work to know where user from. It allows to communicate with knowing time difference and cultural things. See merge request !411
| * | Add location to user pageDmitriy Zaporozhets2015-03-201-0/+4
| | |
| * | Add location to user profileDmitriy Zaporozhets2015-03-206-2/+14
| | |
* | | Merge branch 'change_the_name_of_key' into 'master'Dmitriy Zaporozhets2015-03-202-9/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | Change the name of the key used for bitbucket importer. See merge request !1733
| * | | Fix typo.Marin Jankovski2015-03-201-1/+1
| | | |
| * | | Change the name of the key used for bitbucket importer.Marin Jankovski2015-03-202-9/+10
| | | |
* | | | Merge branch 'link_to_ci_with_ref' into 'master'Dmitriy Zaporozhets2015-03-2010-24/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to CI with ref gitlab/gitlab-ci#162 !!! Should be merged simultaneously with https://dev.gitlab.org/gitlab/gitlab-ci/merge_requests/129 See merge request !1638
| * | | | Link to CI with refValery Sizov2015-03-2010-24/+25
| | | | |
* | | | | Fix votes inline renderingDmitriy Zaporozhets2015-03-201-2/+2
| | | | |
* | | | | Improve issue sidebar positionDmitriy Zaporozhets2015-03-202-2/+2
| |/ / / |/| | |
* | | | Merge branch 'fix-commits-routing' into 'master'Dmitriy Zaporozhets2015-03-201-11/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commits routing for branches with slash Fixes https://github.com/gitlabhq/gitlabhq/issues/8990 See merge request !408
| * | | | Fix commits routingDmitriy Zaporozhets2015-03-201-2/+1
| | | | |
| * | | | Fix commits routing for branches with slashfix-commits-routingDmitriy Zaporozhets2015-03-201-11/+20
| | | | |
* | | | | Merge branch 'upvotes-refactoring' into 'master'Dmitriy Zaporozhets2015-03-206-57/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make issue and merge request sidebar more compact * move votes block to participants * make smaller font in sidebar * remove js for upvoting since it differs from logic on backend and does not work correctly Fixes #1253 Tested on different screens: HD, 1366x768, 1024x600 See merge request !410
| * | | | | Make issue and merge request sidebar more compactupvotes-refactoringDmitriy Zaporozhets2015-03-206-57/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move votes block to participants * make smaller font in sidebar
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-201-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'merge-status-transition' into 'master'Dmitriy Zaporozhets2015-03-201-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge_status state to allow more transitions Previously you could only transition from the unchecked state to one of the others. This meant that the mark_as_unmerged call in AutoMergeService would rarily be able to actually transition the state. As it would usually have already been set to can_be_merged before it hit that service. Spec and Spinach tests have been run locally and all pass. See merge request !405
| | * | | | Update merge_status state to allow more transitionsDJ Mountney2015-03-191-2/+2
| | | |/ / | | |/| | | | | | | | | | | | Previously you could only transition from the unchecked state to one of the others. This meant that the mark_as_unmerged call in AutoMergeService would rarily be able to actually transition the state. As it would usually have already been set to can_be_merged before it hit that service.