15069 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dmitriy Zaporozhets	7d84252e05	Update CHANGELOG with contribution calendar	2015-03-22 14:37:14 -07:00
Dmitriy Zaporozhets	54aca18cf8	Contribution calendar will use events instead of commits to count contributions	2015-03-22 14:35:27 -07:00
Dmitriy Zaporozhets	43afe46bbd	Refactor contributions events and write tests for calendar	2015-03-22 13:55:00 -07:00
Dmitriy Zaporozhets	20a12438ab	Fix user controller specs	2015-03-22 11:14:42 -07:00
Dmitriy Zaporozhets	9c6086bc95	Refactor repository specs	2015-03-22 11:01:45 -07:00
Dmitriy Zaporozhets	64891c6c40	Replace commits calendar with contributions calendar ... * 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	2015-03-21 23:48:08 -07:00
Dmitriy Zaporozhets	29f6b01d63	Merge branch 'improve-profile' into 'master' ... Improve profile ### OLD  ### NEW  See merge request !418	2015-03-22 03:33:29 +00:00
Dmitriy Zaporozhets	777c119fd2	Restyle oauth accounts at profile page and add ability to unlink account	2015-03-21 17:46:00 -07:00
Dmitriy Zaporozhets	9f1c284408	Remove 32px oauth images	2015-03-21 17:41:58 -07:00
Dmitriy Zaporozhets	aadd38dbb9	Merge branch 'backup-permissions' into 'master' ... 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	2015-03-21 23:50:20 +00:00
Dmitriy Zaporozhets	33a9f40059	Merge branch 'add-sidetiq' into 'master' ... Add sidetiq dependency Add the sidetiq gem to the Gemfile to match EE. See #2159. cc @sytse See merge request !1734	2015-03-21 23:38:10 +00:00
Dmitriy Zaporozhets	fad1c2e7c3	Merge branch 'topic/push_tag_events_for_ci' of https://github.com/ayufan/gitlabhq into ayufan-topic/push_tag_events_for_ci	2015-03-21 15:25:54 -07:00
Dmitriy Zaporozhets	63da396f59	Merge branch 'performance-tune' into 'master' ... 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	2015-03-21 21:11:14 +00:00
Dmitriy Zaporozhets	3b5df555f2	Add CHANGELOG item with print view fix	2015-03-21 13:53:11 -07:00
Dmitriy Zaporozhets	a2e43b1bb7	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-21 13:51:23 -07:00
Dmitriy Zaporozhets	f60e75d78d	Merge branch 'fix-upgrade-guide' into 'master' ... 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  ### After  cc @sytse See merge request !1735	2015-03-21 20:49:39 +00:00
Dmitriy Zaporozhets	78e5da3c56	Merge branch 'fix-print-css' into 'master' ... Hide UI elements when print md files or wiki pages Fixes #1023 See merge request !416	2015-03-21 20:47:28 +00:00
Dmitriy Zaporozhets	d96098e966	Cache head commit and head tree	2015-03-21 13:45:08 -07:00
Dmitriy Zaporozhets	c378d20c84	Cache lookup results into hash to prevent repeating same requests to git repo	2015-03-21 13:44:51 -07:00
Dmitriy Zaporozhets	2c796a1785	Cache project branches and tags into variables	2015-03-21 13:44:11 -07:00
Dmitriy Zaporozhets	b624b775aa	Hide UI elements when print md files or wiki pages	2015-03-21 12:13:47 -07:00
Vinnie Okada	5f86c08b2a	Fix link in patch update guide	2015-03-21 11:29:24 -06:00
Vinnie Okada	c5b5c2e7a5	Add sidetiq dependency ... Add the sidetiq gem to the Gemfile to match EE.	2015-03-21 09:34:33 -06:00
Kamil Trzcinski	5b432e7671	Extend push_tag event to include tag message and last commit	2015-03-21 11:25:27 +01:00
Dmitriy Zaporozhets	6cf189f0a9	Merge branch 'improve-avatar-header' into 'master' ... Improve header with avatar for group and user pages Nice looking and aligned headers for user and group pages See merge request !412	2015-03-21 04:30:57 +00:00
Dmitriy Zaporozhets	222e53a026	Prevent diff header overflow	2015-03-20 20:46:04 -07:00
Dmitriy Zaporozhets	beece83af1	Improve header with avatar for group and user pages	2015-03-20 20:15:13 -07:00
Dmitriy Zaporozhets	f0d052b6e7	Merge branch 'user-location' into 'master' ... 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	2015-03-21 00:54:03 +00:00
Dmitriy Zaporozhets	d85f396fe5	Add location to user page	2015-03-20 16:55:20 -07:00
Dmitriy Zaporozhets	6ef20926ee	Add location to user profile	2015-03-20 16:52:23 -07:00
Dmitriy Zaporozhets	52c3a3a0d2	Merge branch 'change_the_name_of_key' into 'master' ... Change the name of the key used for bitbucket importer. See merge request !1733	2015-03-20 23:27:09 +00:00
Marin Jankovski	603b88ab5c	Fix typo.	2015-03-20 16:13:03 -07:00
Marin Jankovski	b7229356d5	Change the name of the key used for bitbucket importer.	2015-03-20 15:54:11 -07:00
Dmitriy Zaporozhets	5738afdb12	Merge branch 'link_to_ci_with_ref' into 'master' ... 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	2015-03-20 22:42:32 +00:00
Dmitriy Zaporozhets	9f9fed4fa2	Fix votes inline rendering	2015-03-20 15:34:29 -07:00
Dmitriy Zaporozhets	b0e2441330	Improve issue sidebar position	2015-03-20 15:33:13 -07:00
Dmitriy Zaporozhets	303382c741	Merge branch 'fix-commits-routing' into 'master' ... Fix commits routing for branches with slash Fixes https://github.com/gitlabhq/gitlabhq/issues/8990 See merge request !408	2015-03-20 20:32:52 +00:00
Dmitriy Zaporozhets	efb8783c4a	Merge branch 'upvotes-refactoring' into 'master' ... 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	2015-03-20 20:17:51 +00:00
Dmitriy Zaporozhets	baaa560290	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-20 13:16:51 -07:00
Dmitriy Zaporozhets	65b392c394	Merge branch 'merge-status-transition' into 'master' ... 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	2015-03-20 20:11:04 +00:00
Dmitriy Zaporozhets	651397513a	Fix commits routing	2015-03-20 13:01:43 -07:00
Dmitriy Zaporozhets	085e5084a8	Make issue and merge request sidebar more compact ... * move votes block to participants * make smaller font in sidebar	2015-03-20 12:50:45 -07:00
Dmitriy Zaporozhets	1f711fd93d	Remove upvotes js logic since it does not work as expected anyway	2015-03-20 12:34:21 -07:00
Dmitriy Zaporozhets	2852d0b620	Fix commits routing for branches with slash	2015-03-20 12:03:48 -07:00
Dmitriy Zaporozhets	d735321ebd	Improve project name truncation on dashboard to work well with sm screen	2015-03-20 11:32:44 -07:00
Valery Sizov	e5fe14b2fb	Link to CI with ref	2015-03-20 19:19:29 +02:00
Dmitriy Zaporozhets	478f92d2c2	Merge branch 'security_fixes' into 'master' ... [security] gems update [doorkeeper] added filtering of sensitive information (like secret key) from production.log [gollum lib] remote code execution (in search field). We don't have search for wiki but it is better to have this fix. Nothing critical!!! related to #2143 See merge request !1732	2015-03-20 16:28:31 +00:00
Valery Sizov	484524e096	gollum-lib update	2015-03-20 15:15:56 +02:00
Valery Sizov	5df1609c82	update doorkeeper to 2.1.3	2015-03-20 15:13:38 +02:00
Marin Jankovski	c6dd117c71	Revert "Merge branch 'new_branch' into 'master'" ... This reverts commit 00607d4f96, reversing changes made to edfc7d0d26.	2015-03-19 23:52:33 -07:00