OSDN Git Service
Dmitriy Zaporozhets [Fri, 16 Aug 2013 09:39:38 +0000 (02:39 -0700)]
Merge pull request #4791 from h2s/wording
Improvements to English text
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
Henry Smith [Thu, 15 Aug 2013 19:06:43 +0000 (20:06 +0100)]
Another wording change in accordance with a suggestion from @karlhungus
Thanks!
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.
Henry Smith [Thu, 15 Aug 2013 18:31:00 +0000 (19:31 +0100)]
Improved wording for the settings in the "My Profile" section
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.
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
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.
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.
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.
Johannes Schleifenbaum [Thu, 15 Aug 2013 12:02:39 +0000 (14:02 +0200)]
Fix the link to the project branches
Dmitriy Zaporozhets [Thu, 15 Aug 2013 11:33:38 +0000 (14:33 +0300)]
Improve UI for Project settings page
Dmitriy Zaporozhets [Thu, 15 Aug 2013 10:24:08 +0000 (13:24 +0300)]
Use bold font at Dashboard#projects and Profile#groups
Dmitriy Zaporozhets [Thu, 15 Aug 2013 10:13:22 +0000 (13:13 +0300)]
Provide links from Group issues, mr pages to corresponding Dashboard pages
Dmitriy Zaporozhets [Thu, 15 Aug 2013 09:46:52 +0000 (12:46 +0300)]
Update project last_activity_at on creation
Dmitriy Zaporozhets [Thu, 15 Aug 2013 09:42:32 +0000 (12:42 +0300)]
Help#permissions improved
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
Dmitriy Zaporozhets [Thu, 15 Aug 2013 09:27:19 +0000 (12:27 +0300)]
Ensure project discover default branch on Project#show
Dmitriy Zaporozhets [Thu, 15 Aug 2013 08:54:16 +0000 (11:54 +0300)]
Search: show recent issues/mr first
Dmitriy Zaporozhets [Thu, 15 Aug 2013 08:51:40 +0000 (11:51 +0300)]
Show label closed on search result
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
Yves Senn [Wed, 14 Aug 2013 13:51:57 +0000 (06:51 -0700)]
Merge pull request #4778 from jkramarz/patch-1
Update installation.md
Dmitriy Zaporozhets [Wed, 14 Aug 2013 13:02:21 +0000 (16:02 +0300)]
Fix passign full user object instead of id to Event.create
Dmitriy Zaporozhets [Wed, 14 Aug 2013 12:14:08 +0000 (15:14 +0300)]
Increase graphs height
Dmitriy Zaporozhets [Wed, 14 Aug 2013 11:20:16 +0000 (14:20 +0300)]
Fixed bug with invalid event author for MR
Dmitriy Zaporozhets [Wed, 14 Aug 2013 11:19:11 +0000 (14:19 +0300)]
Fixed bug with invalid event author
Dmitriy Zaporozhets [Wed, 14 Aug 2013 11:14:23 +0000 (14:14 +0300)]
Better text for custom repo name link
Dmitriy Zaporozhets [Wed, 14 Aug 2013 10:41:06 +0000 (13:41 +0300)]
Allow specify path when create project via api
Dmitriy Zaporozhets [Wed, 14 Aug 2013 10:23:26 +0000 (13:23 +0300)]
Fix ui issue for Help#api
Dmitriy Zaporozhets [Wed, 14 Aug 2013 10:23:12 +0000 (13:23 +0300)]
Allos specify repository name when create a project
Jakub Kramarz [Wed, 14 Aug 2013 10:09:00 +0000 (12:09 +0200)]
Update installation.md
Isn't 5.4 current stable?
Dmitriy Zaporozhets [Wed, 14 Aug 2013 09:45:17 +0000 (12:45 +0300)]
Use native repo path for import task. Skip wiki repos
Dmitriy Zaporozhets [Wed, 14 Aug 2013 09:44:54 +0000 (12:44 +0300)]
Allow project path being passed on project creation
Robin Gloster [Tue, 13 Aug 2013 22:02:27 +0000 (00:02 +0200)]
Fix caching when using remote redis server
Dmitriy Zaporozhets [Tue, 13 Aug 2013 13:57:47 +0000 (16:57 +0300)]
Update gitlab_git to 2.0.1
Dmitriy Zaporozhets [Tue, 13 Aug 2013 13:26:59 +0000 (16:26 +0300)]
Use gitlab_git v2.0.0
Dmitriy Zaporozhets [Tue, 13 Aug 2013 13:26:48 +0000 (16:26 +0300)]
Improve repository graph
Dmitriy Zaporozhets [Tue, 13 Aug 2013 09:24:10 +0000 (12:24 +0300)]
Allow project name, path etc start with number. Fixed specs
Dmitriy Zaporozhets [Tue, 13 Aug 2013 09:04:11 +0000 (12:04 +0300)]
Validate project limit only when create project
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
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
Dmitriy Zaporozhets [Mon, 12 Aug 2013 19:22:31 +0000 (22:22 +0300)]
Improve Commit#show page UI
Dmitriy Zaporozhets [Mon, 12 Aug 2013 17:59:06 +0000 (20:59 +0300)]
Minor UI fix for commit description
Dmitriy Zaporozhets [Mon, 12 Aug 2013 16:28:10 +0000 (19:28 +0300)]
Reload page during repo import
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
Dmitriy Zaporozhets [Mon, 12 Aug 2013 14:21:57 +0000 (17:21 +0300)]
Minor UI improvements
Dmitriy Zaporozhets [Mon, 12 Aug 2013 09:38:30 +0000 (12:38 +0300)]
Minor UI fixes for login page
Dmitriy Zaporozhets [Mon, 12 Aug 2013 09:08:52 +0000 (12:08 +0300)]
Minor UI improvements
Dmitriy Zaporozhets [Sat, 10 Aug 2013 18:20:03 +0000 (21:20 +0300)]
hide no-ssh message if notice or alert present
Dmitriy Zaporozhets [Sat, 10 Aug 2013 18:10:24 +0000 (21:10 +0300)]
More readable notice/alert messages
Dmitriy Zaporozhets [Sat, 10 Aug 2013 17:54:17 +0000 (20:54 +0300)]
Remove unnecessary margin for issue/mr title
Dmitriy Zaporozhets [Sat, 10 Aug 2013 17:30:47 +0000 (17:30 +0000)]
Merge branch 'focus-of-gitlab-recipes' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 10 Aug 2013 17:26:58 +0000 (20:26 +0300)]
Remove unused files
Dmitriy Zaporozhets [Sat, 10 Aug 2013 17:25:53 +0000 (20:25 +0300)]
Rewrite issues/mr filtering logic
Sytse Sijbrandij [Sat, 10 Aug 2013 16:56:15 +0000 (18:56 +0200)]
Mention gitlab recipes correctly, small updates to update section.
Dmitriy Zaporozhets [Sat, 10 Aug 2013 16:37:31 +0000 (19:37 +0300)]
Fix checkall issues checkbox position for FF
Dmitriy Zaporozhets [Sat, 10 Aug 2013 16:30:27 +0000 (19:30 +0300)]
Fix issues update title selectboxes with zero width
Dmitriy Zaporozhets [Sat, 10 Aug 2013 16:12:25 +0000 (19:12 +0300)]
Different search placeholder depdends on area
Dmitriy Zaporozhets [Sat, 10 Aug 2013 14:47:08 +0000 (14:47 +0000)]
Merge branch 'fix-sidekiq-stuck-workers' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Sat, 10 Aug 2013 14:20:33 +0000 (16:20 +0200)]
Fix for Resque forking might cause stuck workers for the threaded Sidekiq.
Dmitriy Zaporozhets [Sat, 10 Aug 2013 10:41:16 +0000 (03:41 -0700)]
Merge pull request #4749 from tdm00/update-install-doc-link-to-master
Change links from 5-3 branch to point to master instead
Dmitriy Zaporozhets [Sat, 10 Aug 2013 10:40:32 +0000 (03:40 -0700)]
Merge pull request #4750 from ronaldvaneede/test_service_button
Fix for #4535 ('Test settings' button for services gives 500 on empty repo)
Dmitriy Zaporozhets [Sat, 10 Aug 2013 10:20:03 +0000 (10:20 +0000)]
Merge branch 'warn-against-using-master' of /home/git/repositories/gitlab/gitlabhq
Ronald van Eede [Fri, 9 Aug 2013 18:14:02 +0000 (20:14 +0200)]
Added can_test? mehod to Service model and added tests
Troy Murray [Fri, 9 Aug 2013 18:08:56 +0000 (14:08 -0400)]
Change links to 5-3 branch to point to master instead
Sytse Sijbrandij [Fri, 9 Aug 2013 13:37:28 +0000 (15:37 +0200)]
Stronger and more specific warning.
Dmitriy Zaporozhets [Fri, 9 Aug 2013 13:17:52 +0000 (16:17 +0300)]
Extend CHANGELOG for 6.0
Dmitriy Zaporozhets [Fri, 9 Aug 2013 13:00:04 +0000 (16:00 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Fri, 9 Aug 2013 12:59:51 +0000 (12:59 +0000)]
Merge branch 'improve-wording' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 9 Aug 2013 12:59:10 +0000 (12:59 +0000)]
Merge branch 'update_gitlab_shell_in_5_4_upgrade' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Fri, 9 Aug 2013 12:46:25 +0000 (14:46 +0200)]
Update to gitlab-shell 1.5.0 during 5.3-5.4 update
Sytse Sijbrandij [Fri, 9 Aug 2013 12:46:09 +0000 (14:46 +0200)]
Thx Jacob.
Sytse Sijbrandij [Fri, 9 Aug 2013 12:25:22 +0000 (14:25 +0200)]
Better wording of diff surpression.
Jacob Vosmaer [Fri, 9 Aug 2013 11:55:17 +0000 (04:55 -0700)]
Merge pull request #4738 from fnkr/patch-1
new animated-screenshots
Florian Kaiser [Fri, 9 Aug 2013 11:31:16 +0000 (13:31 +0200)]
changed the image link to include the commit SHA
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:49:40 +0000 (20:49 +0000)]
Merge branch 'fix/branch-padding' of /home/git/repositories/dzaporozhets/gitlabhq
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:48:06 +0000 (20:48 +0000)]
Remove unecessary paddding at Branches#index page
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:45:36 +0000 (20:45 +0000)]
Merge branch 'master' of /home/git/repositories/dzaporozhets/gitlabhq
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:38:41 +0000 (23:38 +0300)]
quickfix
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:34:36 +0000 (23:34 +0300)]
Fix form mr issue with ci
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:25:47 +0000 (20:25 +0000)]
Remove unecessary paddding at Branches#recent page
Dmitriy Zaporozhets [Thu, 8 Aug 2013 18:26:13 +0000 (21:26 +0300)]
Fix assign-to-me buttton
Dmitriy Zaporozhets [Thu, 8 Aug 2013 18:14:19 +0000 (21:14 +0300)]
Mention Merge requests on forks in changelog
Dmitriy Zaporozhets [Thu, 8 Aug 2013 18:11:28 +0000 (21:11 +0300)]
improve MergeRequest edit page
Dmitriy Zaporozhets [Thu, 8 Aug 2013 16:45:03 +0000 (19:45 +0300)]
update devise to 2.2.5
Dmitriy Zaporozhets [Thu, 8 Aug 2013 16:00:53 +0000 (19:00 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 8 Aug 2013 15:59:46 +0000 (18:59 +0300)]
Compact list for commits page
Dmitriy Zaporozhets [Thu, 8 Aug 2013 15:46:09 +0000 (15:46 +0000)]
Merge branch 'karlhungus-mr-on-fork' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 8 Aug 2013 14:42:27 +0000 (17:42 +0300)]
Revert notification specs
Dmitriy Zaporozhets [Thu, 8 Aug 2013 14:29:31 +0000 (17:29 +0300)]
Fix filter context. Dont duplicate target project name for MR
Jacob Vosmaer [Thu, 8 Aug 2013 14:24:49 +0000 (07:24 -0700)]
Merge pull request #4664 from tdm00/clarify-adding-custom-oauth-provider
Clarify documentation on how to add custom Omniauth provider to GitLab
Troy Murray [Mon, 29 Jul 2013 13:18:31 +0000 (09:18 -0400)]
Clarify documentation on how to add custom Omniauth provider to GitLab
Dmitriy Zaporozhets [Thu, 8 Aug 2013 13:14:38 +0000 (16:14 +0300)]
fix chosen ui. fixed network tests
Dmitriy Zaporozhets [Thu, 8 Aug 2013 12:14:59 +0000 (15:14 +0300)]
Update chosen, improve ui, fix MR fork tests
Florian Kaiser [Thu, 8 Aug 2013 11:51:57 +0000 (13:51 +0200)]
new animated-screenshots
- half size: 1465 KB -> 641KB
- mutch better quality
- no MakeAGIF.com branding
- HTTPS link (via github gist) so there is no github-camo proxy needed (camo makes this image loading 0.55s slower in my short test)
- all source-files are available here: https://gist.github.com/fnkr/
2f9badd56bfe0ed04ee7
Dmitriy Zaporozhets [Thu, 8 Aug 2013 09:44:33 +0000 (12:44 +0300)]
Fix unmerged diff for non-fork MR
Dmitriy Zaporozhets [Thu, 8 Aug 2013 09:30:50 +0000 (12:30 +0300)]
reset db schema
Dmitriy Zaporozhets [Thu, 8 Aug 2013 09:22:09 +0000 (12:22 +0300)]
Merge branch 'master' into karlhungus-mr-on-fork
Conflicts:
app/contexts/filter_context.rb
app/contexts/search_context.rb
app/models/merge_request.rb
app/models/note.rb
app/views/shared/_merge_requests.html.haml
spec/controllers/commit_controller_spec.rb
spec/services/notification_service_spec.rb
Dmitriy Zaporozhets [Thu, 8 Aug 2013 09:12:46 +0000 (12:12 +0300)]
Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Dmitriy Zaporozhets [Thu, 8 Aug 2013 08:58:44 +0000 (11:58 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq