OSDN Git Service
Dmitriy Zaporozhets [Tue, 25 Jun 2013 11:19:33 +0000 (14:19 +0300)]
Fixed cache key difference for graph
Dmitriy Zaporozhets [Tue, 25 Jun 2013 11:12:38 +0000 (14:12 +0300)]
Fix key observer spec
Dmitriy Zaporozhets [Tue, 25 Jun 2013 10:55:03 +0000 (13:55 +0300)]
Cache graph log
Dmitriy Zaporozhets [Tue, 25 Jun 2013 10:41:49 +0000 (13:41 +0300)]
remove text decoration for nav
Dmitriy Zaporozhets [Tue, 25 Jun 2013 10:16:08 +0000 (13:16 +0300)]
Make nav menu a bit higher
Dmitriy Zaporozhets [Tue, 25 Jun 2013 10:15:07 +0000 (13:15 +0300)]
Make group settings menu looks similar to project settings menu
Dmitriy Zaporozhets [Tue, 25 Jun 2013 09:39:58 +0000 (12:39 +0300)]
Use graph ticks to make axis more readable
Dmitriy Zaporozhets [Tue, 25 Jun 2013 09:02:10 +0000 (12:02 +0300)]
Fix key observer
Dmitriy Zaporozhets [Mon, 24 Jun 2013 19:13:00 +0000 (22:13 +0300)]
Merge branch 'master' into 6-0-dev
Conflicts:
app/views/projects/issues/show.html.haml
db/fixtures/development/09_issues.rb
db/fixtures/development/10_merge_requests.rb
Dmitriy Zaporozhets [Mon, 24 Jun 2013 19:03:32 +0000 (22:03 +0300)]
update gems. remove console.log
Dmitriy Zaporozhets [Mon, 24 Jun 2013 18:00:33 +0000 (21:00 +0300)]
Fix ssh key test
Dmitriy Zaporozhets [Mon, 24 Jun 2013 17:47:59 +0000 (20:47 +0300)]
Fix ssh key test
Dmitriy Zaporozhets [Mon, 24 Jun 2013 17:07:21 +0000 (20:07 +0300)]
store and display public key fingerprint
Dmitriy Zaporozhets [Mon, 24 Jun 2013 16:25:10 +0000 (19:25 +0300)]
Better design for SSH keys page
Dmitriy Zaporozhets [Mon, 24 Jun 2013 16:24:27 +0000 (19:24 +0300)]
Fix profile emails with new key route
Dmitriy Zaporozhets [Mon, 24 Jun 2013 15:43:53 +0000 (08:43 -0700)]
Merge pull request #4410 from senny/dont_console_log_in_code
we should not use `console.log` in production code...
Yves Senn [Mon, 24 Jun 2013 15:40:23 +0000 (17:40 +0200)]
we should not use `console.log` in production code...
Dmitriy Zaporozhets [Mon, 24 Jun 2013 15:26:57 +0000 (18:26 +0300)]
Fix new ssh key link from shared partial
Dmitriy Zaporozhets [Mon, 24 Jun 2013 15:24:14 +0000 (18:24 +0300)]
Move Profile related controllers under Profiles:: module
Dmitriy Zaporozhets [Mon, 24 Jun 2013 15:20:58 +0000 (08:20 -0700)]
Merge pull request #3898 from jacargentina/notifymentioned
Notify email to mentioned users; show participants ala github on issuables
Javier Castro [Thu, 9 May 2013 23:37:47 +0000 (20:37 -0300)]
Show participants on issues, including mentions, and notify email to all participants
Dmitriy Zaporozhets [Mon, 24 Jun 2013 13:56:07 +0000 (06:56 -0700)]
Merge pull request #4407 from jackbot/master
Database seeding failing
Jack Weeden [Mon, 24 Jun 2013 13:53:40 +0000 (14:53 +0100)]
Merge branch 'master' of github.com:jackbot/gitlabhq
Jack Weeden [Mon, 24 Jun 2013 13:21:46 +0000 (14:21 +0100)]
cattr_accessor removed from IssueObserver and MergeRequestObserver but not updated in fixtures
Yves Senn [Mon, 24 Jun 2013 07:12:12 +0000 (00:12 -0700)]
Merge pull request #4369 from zeehio/patch-1
[Doc] Update 5.0 to 5.1: Recompile assets
Dmitriy Zaporozhets [Sun, 23 Jun 2013 18:56:05 +0000 (18:56 +0000)]
Merge branch 'refactor/projects_controllers' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev
Dmitriy Zaporozhets [Sun, 23 Jun 2013 17:25:06 +0000 (20:25 +0300)]
Fix routing/controller specs for refactored controllers
Dmitriy Zaporozhets [Sun, 23 Jun 2013 16:47:22 +0000 (19:47 +0300)]
Move projects controllers/views in Projects module
Dmitriy Zaporozhets [Sat, 22 Jun 2013 20:57:29 +0000 (23:57 +0300)]
Lets fix tests
Dmitriy Zaporozhets [Sat, 22 Jun 2013 15:57:34 +0000 (18:57 +0300)]
remove useless routing tests. Added symlink creation for project with code
Dmitriy Zaporozhets [Sat, 22 Jun 2013 13:48:34 +0000 (16:48 +0300)]
gitlab_meta gem to 6.0
Dmitriy Zaporozhets [Sat, 22 Jun 2013 13:46:57 +0000 (16:46 +0300)]
Fix broken factory
Dmitriy Zaporozhets [Sat, 22 Jun 2013 13:00:39 +0000 (16:00 +0300)]
Add comment title to rss feed
Dmitriy Zaporozhets [Sat, 22 Jun 2013 12:11:23 +0000 (15:11 +0300)]
Restrict auto generated routes
Dmitriy Zaporozhets [Sat, 22 Jun 2013 12:08:11 +0000 (15:08 +0300)]
Use simple render syntax in controllers
Dmitriy Zaporozhets [Sat, 22 Jun 2013 12:04:49 +0000 (15:04 +0300)]
Use simplified render syntax
Dmitriy Zaporozhets [Sat, 22 Jun 2013 12:01:08 +0000 (15:01 +0300)]
More db index
Dmitriy Zaporozhets [Sat, 22 Jun 2013 11:45:41 +0000 (04:45 -0700)]
Merge pull request #4385 from Razer6/fix_update_docs_for_master
Fix wrong file versions in update docs (5.2 to 5.3)
Robert Schilling [Sat, 22 Jun 2013 11:29:51 +0000 (13:29 +0200)]
Fix wrong file versions in update docs
Dmitriy Zaporozhets [Sat, 22 Jun 2013 11:11:20 +0000 (14:11 +0300)]
Cleanup: removed unused routing/methods. Improved admin area usability
Dmitriy Zaporozhets [Sat, 22 Jun 2013 10:47:11 +0000 (13:47 +0300)]
Remove unused accessor
Dmitriy Zaporozhets [Sat, 22 Jun 2013 10:41:08 +0000 (13:41 +0300)]
Remove form for adding user to several projects from admin area.
Remove unnecessary projects order on User#show
Dmitriy Zaporozhets [Sat, 22 Jun 2013 10:39:34 +0000 (13:39 +0300)]
Set default order to authorized_project and authorized_groups
Dmitriy Zaporozhets [Sat, 22 Jun 2013 09:57:05 +0000 (12:57 +0300)]
cache project.team.members
Dmitriy Zaporozhets [Sat, 22 Jun 2013 08:38:47 +0000 (11:38 +0300)]
Colors for author additions/develtions in graph
Dmitriy Zaporozhets [Sat, 22 Jun 2013 08:19:12 +0000 (11:19 +0300)]
Merge branch 'master' into 6-0-dev
Conflicts:
VERSION
db/schema.rb
Dmitriy Zaporozhets [Sat, 22 Jun 2013 08:14:07 +0000 (01:14 -0700)]
Merge pull request #3408 from NARKOZ/patch-2
add db index for authentication_token column in users table
Dmitriy Zaporozhets [Sat, 22 Jun 2013 08:02:31 +0000 (11:02 +0300)]
You should not be able to remove a Group owner
Dmitriy Zaporozhets [Sat, 22 Jun 2013 07:56:51 +0000 (10:56 +0300)]
Send project transfer email to all members. Added specs for project move email
Dmitriy Zaporozhets [Fri, 21 Jun 2013 21:11:06 +0000 (00:11 +0300)]
Show also group members on project page at admin area
Dmitriy Zaporozhets [Fri, 21 Jun 2013 21:06:21 +0000 (00:06 +0300)]
Markdown now support users from groups
Dmitriy Zaporozhets [Fri, 21 Jun 2013 21:02:09 +0000 (00:02 +0300)]
Make it possible to assign/mention users from group members
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:47:42 +0000 (23:47 +0300)]
prevent document unbind since it breaks rails ujs
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:36:02 +0000 (23:36 +0300)]
Fix notifications for group projects
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:21:55 +0000 (23:21 +0300)]
Respect group membership in notification service
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:19:30 +0000 (23:19 +0300)]
You can setup per-group notification level
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:17:58 +0000 (23:17 +0300)]
Adding groups to notification settings
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:17:41 +0000 (23:17 +0300)]
Notifiable concern
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:17:20 +0000 (23:17 +0300)]
Add notification level to group membership
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:49:14 +0000 (19:49 +0000)]
Merge branch 'install-guide-improvements' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:47:49 +0000 (22:47 +0300)]
Do not create a User <-> Project relation if project is under group
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:44:40 +0000 (22:44 +0300)]
Use own abilities for namespace class
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:38:43 +0000 (22:38 +0300)]
User#owned_groups is now respect group membership
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:34:38 +0000 (22:34 +0300)]
Unbind all document.on click/scroll after page fetch
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:29:30 +0000 (22:29 +0300)]
Unbind note events to prevent firing twice with turbolinks
Sytse Sijbrandij [Fri, 21 Jun 2013 19:18:20 +0000 (21:18 +0200)]
Merge branch 'master' into install-guide-improvements
Conflicts:
doc/install/installation.md
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:08:16 +0000 (22:08 +0300)]
Remove $.ready events
Dmitriy Zaporozhets [Fri, 21 Jun 2013 18:50:34 +0000 (21:50 +0300)]
Remove tests for missing method
Dmitriy Zaporozhets [Fri, 21 Jun 2013 13:42:59 +0000 (16:42 +0300)]
Since masters_projects does not cover most of cases now we use authorized_projects for DeployKey read access
Dmitriy Zaporozhets [Fri, 21 Jun 2013 13:36:28 +0000 (16:36 +0300)]
Improve query of authorized_projects. Cache results for authorized_groups, authorized_projects methods
Dmitriy Zaporozhets [Fri, 21 Jun 2013 13:16:05 +0000 (16:16 +0300)]
Remove invalid information from /u/:user page
Sergio Oller [Fri, 21 Jun 2013 09:05:21 +0000 (11:05 +0200)]
[Doc] Update 5.0 to 5.1: Recompile assets
Recompiling assets on the update is needed or main menu appearance may not load properly. This has been mentioned on issues #3722 and #3978.
The command has been tested several by users on those issues and by myself.
Thanks for your time and attention.
Dmitriy Zaporozhets [Fri, 21 Jun 2013 06:19:31 +0000 (09:19 +0300)]
Better name for sign in tab
Dmitriy Zaporozhets [Fri, 21 Jun 2013 05:51:15 +0000 (08:51 +0300)]
Fix spell error in sing in
Dmitriy Zaporozhets [Thu, 20 Jun 2013 12:59:39 +0000 (15:59 +0300)]
Dark color for group name at header. Better name for activity
Dmitriy Zaporozhets [Thu, 20 Jun 2013 10:29:17 +0000 (13:29 +0300)]
Fix admin:groups test
Dmitriy Zaporozhets [Thu, 20 Jun 2013 10:14:23 +0000 (13:14 +0300)]
Fix seeds. More projects for dev seeds
Dmitriy Zaporozhets [Thu, 20 Jun 2013 09:06:44 +0000 (12:06 +0300)]
Fix user add to group from admin area
Dmitriy Zaporozhets [Thu, 20 Jun 2013 08:46:54 +0000 (11:46 +0300)]
Classic (mars) theme will be default for 6.0
Dmitriy Zaporozhets [Thu, 20 Jun 2013 08:32:59 +0000 (11:32 +0300)]
New logo/color for login screen
Dmitriy Zaporozhets [Thu, 20 Jun 2013 06:51:09 +0000 (09:51 +0300)]
Update docs from 5.2 to 5.3
Dmitriy Zaporozhets [Wed, 19 Jun 2013 20:03:43 +0000 (23:03 +0300)]
Add < 1200px support for project filter on dashboard
Dmitriy Zaporozhets [Wed, 19 Jun 2013 19:55:49 +0000 (22:55 +0300)]
Move from table to list for Hooks page
Dmitriy Zaporozhets [Wed, 19 Jun 2013 19:52:57 +0000 (22:52 +0300)]
Fixed sub navs spinach tests for project
Dmitriy Zaporozhets [Wed, 19 Jun 2013 19:44:57 +0000 (22:44 +0300)]
Squash project settings navs
Dmitriy Zaporozhets [Wed, 19 Jun 2013 18:58:52 +0000 (21:58 +0300)]
Dont show remove/modify controls for personal project owner
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:57:32 +0000 (19:57 +0300)]
Version to 5.3
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:54:10 +0000 (19:54 +0300)]
Restore users assoc with project
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:50:28 +0000 (16:50 +0000)]
Merge branch 'improve/dash_projects_page' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:50:14 +0000 (16:50 +0000)]
Merge branch 'remove/root_namespace' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:48:48 +0000 (19:48 +0300)]
Migrate global project taks. Removed more teams related functionality
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:38:43 +0000 (19:38 +0300)]
Fix random failing tests with project teams
Dmitriy Zaporozhets [Wed, 19 Jun 2013 15:32:08 +0000 (18:32 +0300)]
Remove Global namespace from options. Prepared file for migration of global projects
Dmitriy Zaporozhets [Wed, 19 Jun 2013 15:24:18 +0000 (18:24 +0300)]
Remove dash projects search test
Dmitriy Zaporozhets [Wed, 19 Jun 2013 14:48:43 +0000 (17:48 +0300)]
Remove second search. More compact list. Additional filter
Dmitriy Zaporozhets [Wed, 19 Jun 2013 12:40:33 +0000 (15:40 +0300)]
Annotated
Dmitriy Zaporozhets [Wed, 19 Jun 2013 10:52:25 +0000 (13:52 +0300)]
Filter projects on dashboard
Dmitriy Zaporozhets [Wed, 19 Jun 2013 05:39:46 +0000 (05:39 +0000)]
Merge branch 'remove/user_teams' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev
Dmitriy Zaporozhets [Tue, 18 Jun 2013 19:06:20 +0000 (22:06 +0300)]
Remove teams specs
Dmitriy Zaporozhets [Tue, 18 Jun 2013 18:54:31 +0000 (21:54 +0300)]
More userteam links removed. Removed teams spinach tests