OSDN Git Service

wvm/gitlab.git
10 years agoRemove deprecated models
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:08:32 +0000 (12:08 +0300)]
Remove deprecated models

10 years agoDrop deprecated tables
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:08:10 +0000 (12:08 +0300)]
Drop deprecated tables

10 years agoWarn about update to 6.1
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:04:33 +0000 (12:04 +0300)]
Warn about update to 6.1

10 years agoFix migrate_iids for issues
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:41:05 +0000 (22:41 +0300)]
Fix migrate_iids for issues

10 years agoPrepare doc for update from 6.0 to 6.1
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:34:14 +0000 (22:34 +0300)]
Prepare doc for update from 6.0 to 6.1

10 years ago6.1.0pre
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:30:45 +0000 (22:30 +0300)]
6.1.0pre

10 years agoMerge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:30:38 +0000 (19:30 +0000)]
Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq

10 years agoMerge pull request #4819 from croemmich/patch-1
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:28:19 +0000 (12:28 -0700)]
Merge pull request #4819 from croemmich/patch-1

Update to gitlab-shell 1.7.0 during 5.4-6.0 update

10 years agoFix wrong branch in install docs
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:14:22 +0000 (22:14 +0300)]
Fix wrong branch in install docs

10 years agoUpdate to gitlab-shell 1.7.0 during 5.4-6.0 update
Chris Roemmich [Tue, 20 Aug 2013 19:13:49 +0000 (14:13 -0500)]
Update to gitlab-shell 1.7.0 during 5.4-6.0 update

10 years agoFix bug in installation doc with non-install unicorn
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:12:42 +0000 (22:12 +0300)]
Fix bug in installation doc with non-install unicorn

10 years agoMerge branch 'refactor/access_roles' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:10:40 +0000 (19:10 +0000)]
Merge branch 'refactor/access_roles' of /home/git/repositories/gitlab/gitlabhq

10 years agoMerge pull request #4812 from hiroponz/remove-dependancy-of-grit
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:09:35 +0000 (12:09 -0700)]
Merge pull request #4812 from hiroponz/remove-dependancy-of-grit

Remove the dependancy of grit from class Network::Graph

10 years agoTime for 6.0.0 v6.0.0
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:05:58 +0000 (22:05 +0300)]
Time for 6.0.0

10 years agoBold names for public projects
Dmitriy Zaporozhets [Tue, 20 Aug 2013 18:50:33 +0000 (21:50 +0300)]
Bold names for public projects

10 years agoFix tests
Dmitriy Zaporozhets [Tue, 20 Aug 2013 18:41:14 +0000 (21:41 +0300)]
Fix tests

10 years agoRender small avatars for inline events
Dmitriy Zaporozhets [Tue, 20 Aug 2013 18:31:37 +0000 (21:31 +0300)]
Render small avatars for inline events

10 years agoFix event image preview
Dmitriy Zaporozhets [Tue, 20 Aug 2013 18:20:11 +0000 (21:20 +0300)]
Fix event image preview

10 years agoDashboard event right margin + increased padding
Dmitriy Zaporozhets [Tue, 20 Aug 2013 18:09:54 +0000 (21:09 +0300)]
Dashboard event right margin + increased padding

10 years agoRename wiki repo if project repo was removed
Dmitriy Zaporozhets [Tue, 20 Aug 2013 14:44:15 +0000 (17:44 +0300)]
Rename wiki repo if project repo was removed

10 years agoSearching for issue/mr by iid in markdown
Dmitriy Zaporozhets [Tue, 20 Aug 2013 14:31:26 +0000 (17:31 +0300)]
Searching for issue/mr by iid in markdown

10 years agoFixing tests after adding iid for issues/mr
Dmitriy Zaporozhets [Tue, 20 Aug 2013 13:56:05 +0000 (16:56 +0300)]
Fixing tests after adding iid for issues/mr

10 years agoRefactor access roles methods
Dmitriy Zaporozhets [Tue, 20 Aug 2013 12:59:45 +0000 (15:59 +0300)]
Refactor access roles methods

10 years agoAdded Gitlab::Access module
Dmitriy Zaporozhets [Tue, 20 Aug 2013 12:59:26 +0000 (15:59 +0300)]
Added Gitlab::Access module

11 years agoIts time for 6.0.0rc1
Dmitriy Zaporozhets [Tue, 20 Aug 2013 09:41:56 +0000 (12:41 +0300)]
Its time for 6.0.0rc1

11 years agoBetter message for migrating global projects
Dmitriy Zaporozhets [Tue, 20 Aug 2013 09:40:51 +0000 (12:40 +0300)]
Better message for migrating global projects

11 years agoRemove the dependancy of grit from class Network::Graph
Hiroyuki Sato [Tue, 20 Aug 2013 03:05:23 +0000 (12:05 +0900)]
Remove the dependancy of grit from class Network::Graph

11 years agoMerge branch 'init-script-should-restart-unicorn' of /home/git/repositories/gitlab...
Dmitriy Zaporozhets [Mon, 19 Aug 2013 20:22:14 +0000 (20:22 +0000)]
Merge branch 'init-script-should-restart-unicorn' of /home/git/repositories/gitlab/gitlabhq

11 years agoRelative root needs to be changed in three places.
Sytse Sijbrandij [Mon, 19 Aug 2013 20:20:32 +0000 (22:20 +0200)]
Relative root needs to be changed in three places.

11 years agoFix confusing situation where install guide told you to install init.d script for...
Sytse Sijbrandij [Mon, 19 Aug 2013 19:54:12 +0000 (21:54 +0200)]
Fix confusing situation where install guide told you to install init.d script for puma.

11 years agoIid improvemets
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:53:11 +0000 (22:53 +0300)]
Iid improvemets

* call set_iid before validation
* make rake task pass event if objects are invalid
* show iid in comment event at dashboard

11 years agoConfigure the relative path only one time.
Sytse Sijbrandij [Mon, 19 Aug 2013 19:49:27 +0000 (21:49 +0200)]
Configure the relative path only one time.

11 years agoShow iid in event feed and uatocomplete as default id for issues, mr
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:12:59 +0000 (22:12 +0300)]
Show iid in event feed and uatocomplete as default id for issues, mr

11 years agoShow iid as default id for issues, mr
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:12:40 +0000 (22:12 +0300)]
Show iid as default id for issues, mr

11 years agoFind issues and Mr by iid in controller
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:12:04 +0000 (22:12 +0300)]
Find issues and Mr by iid in controller

11 years agoCreate task to create iid for existing issues/mr
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:11:18 +0000 (22:11 +0300)]
Create task to create iid for existing issues/mr

11 years agoSett iid on create. Use iid as value to_param
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:10:56 +0000 (22:10 +0300)]
Sett iid on create. Use iid as value to_param

11 years agoAdd iid field to issues and MR
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:10:21 +0000 (22:10 +0300)]
Add iid field to issues and MR

11 years agoMake repo graph work for large repos on slower machines
Dmitriy Zaporozhets [Mon, 19 Aug 2013 17:11:41 +0000 (20:11 +0300)]
Make repo graph work for large repos on slower machines

11 years agoits time for beta
Dmitriy Zaporozhets [Mon, 19 Aug 2013 15:52:19 +0000 (18:52 +0300)]
its time for beta

11 years agoMerge pull request #4670 from anezi/relative-url-patch
Dmitriy Zaporozhets [Mon, 19 Aug 2013 12:42:20 +0000 (05:42 -0700)]
Merge pull request #4670 from anezi/relative-url-patch

More fixes for supporting Relative URL

11 years agoMerge pull request #4797 from mbajur/flashes-revived
Dmitriy Zaporozhets [Mon, 19 Aug 2013 10:32:31 +0000 (03:32 -0700)]
Merge pull request #4797 from mbajur/flashes-revived

Make flash messages fixed and sticked to bottom

11 years agoUpdate flash message timeout to 5 seconds
Mike Bajur [Sat, 17 Aug 2013 14:36:44 +0000 (16:36 +0200)]
Update flash message timeout to 5 seconds

11 years agoMake flash messages fixed and sticked to bottom
GitLab [Sat, 17 Aug 2013 10:32:59 +0000 (06:32 -0400)]
Make flash messages fixed and sticked to bottom

11 years agoFixed wrong last-edit time for wiki
Dmitriy Zaporozhets [Fri, 16 Aug 2013 13:59:26 +0000 (16:59 +0300)]
Fixed wrong last-edit time for wiki

11 years agoDont render event body if empty
Dmitriy Zaporozhets [Fri, 16 Aug 2013 12:40:55 +0000 (15:40 +0300)]
Dont render event body if empty

11 years agoMinor UI improvements to event feed
Dmitriy Zaporozhets [Fri, 16 Aug 2013 12:37:42 +0000 (15:37 +0300)]
Minor UI improvements to event feed

11 years agoReduce padding for events on dashboard
Dmitriy Zaporozhets [Fri, 16 Aug 2013 12:28:32 +0000 (15:28 +0300)]
Reduce padding for events on dashboard

11 years agoMerge branch 'mention-unicorn' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 16 Aug 2013 09:56:08 +0000 (09:56 +0000)]
Merge branch 'mention-unicorn' of /home/git/repositories/gitlab/gitlabhq

11 years agoInformation about teams in changelog and switching to unicorn for all people.
Sytse Sijbrandij [Fri, 16 Aug 2013 09:53:52 +0000 (11:53 +0200)]
Information about teams in changelog and switching to unicorn for all people.

11 years agoUnix line endings.
Sytse Sijbrandij [Fri, 16 Aug 2013 09:49:49 +0000 (11:49 +0200)]
Unix line endings.

11 years agoMerge pull request #4791 from h2s/wording
Dmitriy Zaporozhets [Fri, 16 Aug 2013 09:39:38 +0000 (02:39 -0700)]
Merge pull request #4791 from h2s/wording

Improvements to English text

11 years agoMerge pull request #4789 from jojosch/fix-link-project-branches
Dmitriy Zaporozhets [Thu, 15 Aug 2013 20:29:01 +0000 (13:29 -0700)]
Merge pull request #4789 from jojosch/fix-link-project-branches

Fix the link to the project branches

11 years agoFixes grack authentification under relative_url_root
amouhzi [Tue, 30 Jul 2013 14:48:00 +0000 (16:48 +0200)]
Fixes grack authentification under relative_url_root

Ref: https://github.com/gitlabhq/gitlabhq/commit/e6159b8725f99af78f446f8d33fa0e52b7780430
Ref: https://github.com/gitlabhq/gitlabhq/pull/3204
Ref: https://github.com/gitlabhq/gitlabhq/issues/1228

Add Rails' variable in application.rb to support relative url

This variable is used by assets compilation and other modules.

Note that user needs to change application.rb too

Restrict session cookie to the relative path if set.

Ref: https://github.com/gitlabhq/gitlabhq/commit/2c2f1e31856a4decdae469974f5bea8245316f7e

Fix Update attachment_uploader.rb bug with relative URL

See: https://github.com/gitlabhq/gitlabhq/commit/161afda3fa4fca58f396e9c3acbd72bc14490ace

Fix Wall relative bug with attachement files (javascript)

11 years agoAnother wording change in accordance with a suggestion from @karlhungus
Henry Smith [Thu, 15 Aug 2013 19:06:43 +0000 (20:06 +0100)]
Another wording change in accordance with a suggestion from @karlhungus

Thanks!

11 years agoChanging text as per the suggestion by @karlhungus
Henry Smith [Thu, 15 Aug 2013 19:04:09 +0000 (20:04 +0100)]
Changing text as per the suggestion by @karlhungus

Definitely sounds better like this.

11 years agoImproved wording for the settings in the "My Profile" section
Henry Smith [Thu, 15 Aug 2013 18:31:00 +0000 (19:31 +0100)]
Improved wording for the settings in the "My Profile" section

11 years agoLots of wording improvements for the project settings area
Henry Smith [Thu, 15 Aug 2013 18:19:29 +0000 (19:19 +0100)]
Lots of wording improvements for the project settings area

Summary:

 - Mostly very small things involving use of "a", "the" etc.
 - "post-receive" hooks are usually written with the hyphen in the name .
 - I changed the Web Hooks page to have a title consistent with all the other
   pages in the settings area.
 - More consistent usage of full-stops in lists.

11 years agoA couple of small wording improvements for the merge request approval page
Henry Smith [Thu, 15 Aug 2013 18:01:05 +0000 (19:01 +0100)]
A couple of small wording improvements for the merge request approval page

11 years agoImproved wording for the "light" heading sentences for the main dashboard pages
Henry Smith [Thu, 15 Aug 2013 17:58:22 +0000 (18:58 +0100)]
Improved wording for the "light" heading sentences for the main dashboard pages

These are just a few very particular fixes for small grammatical issues,
intended to polish the reading experience.

11 years agoWording improvements in the zero_authorized_projects template
Henry Smith [Thu, 15 Aug 2013 17:50:17 +0000 (18:50 +0100)]
Wording improvements in the zero_authorized_projects template

I've reworded the first sentence to say "You don't have access to any projects",
which I think sounds more natural.

I've also used the "pluralize" ActionView helper for the user's projects_limit,
so that it still looks good when it says "You can create up to 1 project.".

Finally, I've tweaked the structure of the final sentence a little bit to make
it sound a bit better.

11 years agoMore specific empty state message wording
Henry Smith [Thu, 15 Aug 2013 17:31:16 +0000 (18:31 +0100)]
More specific empty state message wording

I've changed all the instances of "Nothing to show here" to specifically mention
the name of the entity of which there are none to show. This makes for a
slightly smoother reading experience.

11 years agoFix the link to the project branches
Johannes Schleifenbaum [Thu, 15 Aug 2013 12:02:39 +0000 (14:02 +0200)]
Fix the link to the project branches

11 years agoImprove UI for Project settings page
Dmitriy Zaporozhets [Thu, 15 Aug 2013 11:33:38 +0000 (14:33 +0300)]
Improve UI for Project settings page

11 years agoUse bold font at Dashboard#projects and Profile#groups
Dmitriy Zaporozhets [Thu, 15 Aug 2013 10:24:08 +0000 (13:24 +0300)]
Use bold font at Dashboard#projects and Profile#groups

11 years agoProvide links from Group issues, mr pages to corresponding Dashboard pages
Dmitriy Zaporozhets [Thu, 15 Aug 2013 10:13:22 +0000 (13:13 +0300)]
Provide links from Group issues, mr pages to corresponding Dashboard pages

11 years agoUpdate project last_activity_at on creation
Dmitriy Zaporozhets [Thu, 15 Aug 2013 09:46:52 +0000 (12:46 +0300)]
Update project last_activity_at on creation

11 years agoHelp#permissions improved
Dmitriy Zaporozhets [Thu, 15 Aug 2013 09:42:32 +0000 (12:42 +0300)]
Help#permissions improved

11 years agoMerge pull request #4601 from keith9820/master
Dmitriy Zaporozhets [Thu, 15 Aug 2013 09:32:37 +0000 (02:32 -0700)]
Merge pull request #4601 from keith9820/master

Show permissions as a grid

11 years agoEnsure project discover default branch on Project#show
Dmitriy Zaporozhets [Thu, 15 Aug 2013 09:27:19 +0000 (12:27 +0300)]
Ensure project discover default branch on Project#show

11 years agoSearch: show recent issues/mr first
Dmitriy Zaporozhets [Thu, 15 Aug 2013 08:54:16 +0000 (11:54 +0300)]
Search: show recent issues/mr first

11 years agoShow label closed on search result
Dmitriy Zaporozhets [Thu, 15 Aug 2013 08:51:40 +0000 (11:51 +0300)]
Show label closed on search result

11 years agoMerge pull request #4775 from globin/remote_cache_redis
Dmitriy Zaporozhets [Wed, 14 Aug 2013 16:03:54 +0000 (09:03 -0700)]
Merge pull request #4775 from globin/remote_cache_redis

Fix caching when using remote redis server

11 years agoMerge pull request #4778 from jkramarz/patch-1
Yves Senn [Wed, 14 Aug 2013 13:51:57 +0000 (06:51 -0700)]
Merge pull request #4778 from jkramarz/patch-1

Update installation.md

11 years agoFix passign full user object instead of id to Event.create
Dmitriy Zaporozhets [Wed, 14 Aug 2013 13:02:21 +0000 (16:02 +0300)]
Fix passign full user object instead of id to Event.create

11 years agoIncrease graphs height
Dmitriy Zaporozhets [Wed, 14 Aug 2013 12:14:08 +0000 (15:14 +0300)]
Increase graphs height

11 years agoFixed bug with invalid event author for MR
Dmitriy Zaporozhets [Wed, 14 Aug 2013 11:20:16 +0000 (14:20 +0300)]
Fixed bug with invalid event author for MR

11 years agoFixed bug with invalid event author
Dmitriy Zaporozhets [Wed, 14 Aug 2013 11:19:11 +0000 (14:19 +0300)]
Fixed bug with invalid event author

11 years agoBetter text for custom repo name link
Dmitriy Zaporozhets [Wed, 14 Aug 2013 11:14:23 +0000 (14:14 +0300)]
Better text for custom repo name link

11 years agoAllow specify path when create project via api
Dmitriy Zaporozhets [Wed, 14 Aug 2013 10:41:06 +0000 (13:41 +0300)]
Allow specify path when create project via api

11 years agoFix ui issue for Help#api
Dmitriy Zaporozhets [Wed, 14 Aug 2013 10:23:26 +0000 (13:23 +0300)]
Fix ui issue for Help#api

11 years agoAllos specify repository name when create a project
Dmitriy Zaporozhets [Wed, 14 Aug 2013 10:23:12 +0000 (13:23 +0300)]
Allos specify repository name when create a project

11 years agoUpdate installation.md
Jakub Kramarz [Wed, 14 Aug 2013 10:09:00 +0000 (12:09 +0200)]
Update installation.md

Isn't 5.4 current stable?

11 years agoUse native repo path for import task. Skip wiki repos
Dmitriy Zaporozhets [Wed, 14 Aug 2013 09:45:17 +0000 (12:45 +0300)]
Use native repo path for import task. Skip wiki repos

11 years agoAllow project path being passed on project creation
Dmitriy Zaporozhets [Wed, 14 Aug 2013 09:44:54 +0000 (12:44 +0300)]
Allow project path being passed on project creation

11 years agoFix caching when using remote redis server
Robin Gloster [Tue, 13 Aug 2013 22:02:27 +0000 (00:02 +0200)]
Fix caching when using remote redis server

11 years agoUpdate gitlab_git to 2.0.1
Dmitriy Zaporozhets [Tue, 13 Aug 2013 13:57:47 +0000 (16:57 +0300)]
Update gitlab_git to 2.0.1

11 years agoUse gitlab_git v2.0.0
Dmitriy Zaporozhets [Tue, 13 Aug 2013 13:26:59 +0000 (16:26 +0300)]
Use gitlab_git v2.0.0

11 years agoImprove repository graph
Dmitriy Zaporozhets [Tue, 13 Aug 2013 13:26:48 +0000 (16:26 +0300)]
Improve repository graph

11 years agoAllow project name, path etc start with number. Fixed specs
Dmitriy Zaporozhets [Tue, 13 Aug 2013 09:24:10 +0000 (12:24 +0300)]
Allow project name, path etc start with number. Fixed specs

11 years agoValidate project limit only when create project
Dmitriy Zaporozhets [Tue, 13 Aug 2013 09:04:11 +0000 (12:04 +0300)]
Validate project limit only when create project

11 years agoIncrease commit title limit at Commit#show so it does not truncate most of Merge...
Dmitriy Zaporozhets [Mon, 12 Aug 2013 19:28:31 +0000 (22:28 +0300)]
Increase commit title limit at Commit#show so it does not truncate most of Merge messages

11 years agoPrevent 500 on project home page if project has extremely huge number of commits
Dmitriy Zaporozhets [Mon, 12 Aug 2013 19:23:01 +0000 (22:23 +0300)]
Prevent 500 on project home page if project has extremely huge number of commits

11 years agoImprove Commit#show page UI
Dmitriy Zaporozhets [Mon, 12 Aug 2013 19:22:31 +0000 (22:22 +0300)]
Improve Commit#show page UI

11 years agoMinor UI fix for commit description
Dmitriy Zaporozhets [Mon, 12 Aug 2013 17:59:06 +0000 (20:59 +0300)]
Minor UI fix for commit description

11 years agoReload page during repo import
Dmitriy Zaporozhets [Mon, 12 Aug 2013 16:28:10 +0000 (19:28 +0300)]
Reload page during repo import

11 years agoRepository import during project creation often return timeout for medium and large...
Dmitriy Zaporozhets [Mon, 12 Aug 2013 15:21:47 +0000 (18:21 +0300)]
Repository import during project creation often return timeout for medium and large repos.
So lets do it async. First create project, then import repo and create
satellite with Sidekiq

11 years agoMinor UI improvements
Dmitriy Zaporozhets [Mon, 12 Aug 2013 14:21:57 +0000 (17:21 +0300)]
Minor UI improvements

11 years agoMinor UI fixes for login page
Dmitriy Zaporozhets [Mon, 12 Aug 2013 09:38:30 +0000 (12:38 +0300)]
Minor UI fixes for login page

11 years agoMinor UI improvements
Dmitriy Zaporozhets [Mon, 12 Aug 2013 09:08:52 +0000 (12:08 +0300)]
Minor UI improvements