Commit Graph
6502 Commits
Author SHA1 Message Date
Jason Hollingsworth e1fa9abd89 Change archive icon and clone panel styling. 2013-12-18 08:46:06 -06:00
Dmitriy Zaporozhets 5e21976d13 Set font-weight:500 for row titles
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 16:33:40 +02:00
Dmitriy Zaporozhets 078b3f580e Rename Services to Project services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 16:27:52 +02:00
Dmitriy Zaporozhets 3b0acc9eea Merge branch 'bug/archive_label_overflow' of /home/git/repositories/gitlab/gitlabhq 2013-12-18 14:22:59 +00:00
Dmitriy Zaporozhets 4efaa51bbe Make comment preview button white
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 16:07:49 +02:00
Dmitriy Zaporozhets 1f41e1bcdd Improve commits page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 16:03:59 +02:00
Dmitriy Zaporozhets 5cb8525891 move arhoved label from project title to sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 15:02:31 +02:00
Dmitriy Zaporozhets 79248f4ca5 Merge pull request #5866 from jhollingsworth/fix/default-public-pull-url
Update default public pull url.
2013-12-18 04:41:06 -08:00
Dmitriy Zaporozhets dad576a777 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-18 14:40:37 +02:00
Dmitriy Zaporozhets bb0a47d410 Merge pull request #5868 from beautyfree/patch-1
Duplicate opened scope for issue
2013-12-18 04:23:13 -08:00
Dmitriy Zaporozhets 6ac73f45f0 Move EmailOnPush logic to async worker
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 13:42:12 +02:00
Hans Lemuet ff0d8a18bf tiny wording fix
GitLab users can can see this snippet -> GitLab users can see this snippet
2013-12-18 00:04:40 +01:00
Alexey Elizarov 984eb08cbe Duplicate opened scope for issue
Was it correct?
2013-12-17 23:32:19 +03:00
Jason Hollingsworth 1521f467cb Update default public pull url.
This updates the default pull URL for public projects when the user
is not logged in.
2013-12-17 12:48:59 -06:00
skv 3adf35fb64 pluck user_ids during team import 2013-12-17 22:37:56 +04:00
Jason Blanchard 65448e2ff7 Added dropdown menus to issue#show page for assignee and milestone 2013-12-17 09:39:50 -05:00
Dmitriy Zaporozhets 5f85d6d1ce Better description to EmailsOnPush service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 16:31:12 +02:00
Dmitriy Zaporozhets 074efd8fd5 Email on push: dont send email if new branch was pushed or branch was removed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 16:20:45 +02:00
Dmitriy Zaporozhets 8b89ef8639 Add templates for Emails on push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 15:30:15 +02:00
Dmitriy Zaporozhets d550933907 Add new method to mailer for deliver emails with push info
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 14:45:55 +02:00
Dmitriy Zaporozhets 2428a0b2dd Add project_services dir to autoload path
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 12:58:44 +02:00
Dmitriy Zaporozhets 86a8796b13 Create EmailsOnPushService model
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 12:42:40 +02:00
Dmitriy Zaporozhets 5ac5730547 Sort project services by title. Add textarea support to it
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 12:42:13 +02:00
Dmitriy Zaporozhets b90cbfd21e Move project services models to own subdirectory
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 12:20:36 +02:00
Dmitriy Zaporozhets 3d7edf0fe3 Merge pull request #5862 from jvanbaarsen/patch-1
Fixed the no_avatar.png path
2013-12-16 22:54:49 -08:00
Dmitriy Zaporozhets fe07c737aa Merge branch 'improve/devise_ui' of /home/git/repositories/gitlab/gitlabhq 2013-12-17 06:05:52 +00:00
Jeroen van Baarsen a9d1038f03 Fixed the no_avatar.png path
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4394
2013-12-16 21:56:45 +01:00
Dmitriy Zaporozhets dea02363d4 Merge branch 'feature/project_in_mr_emails' of /home/git/repositories/gitlab/gitlabhq 2013-12-16 19:30:52 +00:00
Dmitriy Zaporozhets 80c4657fa7 Merge branch 'improve/repo_head_update'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
2013-12-16 21:30:24 +02:00
Dmitriy Zaporozhets 42003f5312 Improve UI/UX for reset_password, signup, confirmation pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-16 21:11:52 +02:00
Dmitriy Zaporozhets 6f556d8e71 Add resend-confirmation-link to sign-in page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-16 21:10:59 +02:00
Dmitriy Zaporozhets 687cf48e60 Improve email with confirmation instructions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-16 21:10:18 +02:00
Dmitriy Zaporozhets 84f9613775 Style devise error messages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-16 21:09:15 +02:00
Dmitriy Zaporozhets f40ad6ce40 Merge pull request #5841 from Popl7/archiving_old_projects
Archiving old projects for feature request
2013-12-16 10:06:26 -08:00
Dmitriy Zaporozhets ca29617d54 Merge pull request #5843 from bke-drewb/fix/dashboard_event_updates
Fix dashboard event caching
2013-12-16 10:03:52 -08:00
Dmitriy Zaporozhets 0429740af6 Add @project variable to merge request emails
After this change project name appears in the top part of email when you
open/close/accept merge request.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-16 19:56:47 +02:00
Dmitriy Zaporozhets 28bb65f363 Update repository head successively during project update
It prevents situation when async worker slowly updates HEAD and we show
old branch as repository HEAD in project settings

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-16 19:34:56 +02:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
2013-12-16 14:39:14 +01:00
Dmitriy Zaporozhets b7fc0e81ce Merge pull request #5849 from bke-drewb/feature/hide_no_ssh_key_message
Allow user to hide the message to add an ssh key permanently
2013-12-16 03:25:00 -08:00
Dmitriy Zaporozhets d46dba5830 Merge pull request #5847 from skv-headless/fix_deprecation_warnings
fix most of warnings
2013-12-16 03:22:55 -08:00
Dmitriy Zaporozhets 4227f6ed14 Merge pull request #5856 from nishigori/fix-typo
Fix messages typo
2013-12-16 02:54:15 -08:00
Dmitriy Zaporozhets 3f709e0a97 Merge pull request #5848 from bke-drewb/feature/time_ago_tooltips
Add time ago tooltips to show actual date/time
2013-12-16 02:53:12 -08:00
Dmitriy Zaporozhets 3221dc5381 Merge pull request #5681 from chopmann/patch-2
FIX: Browser back button breaks "Loading..." visual
2013-12-16 02:51:23 -08:00
Takuya Nishigori e78b90ab1d Fix messages typo 2013-12-16 17:57:50 +09:00
J.M 3229311b0b Make sidebar links more accessible, display: block 2013-12-15 11:49:54 +01:00
Drew Blessing d9b5777db1 Allow user to hide the message to add an ssh key permanently
Favor links instead of buttons

Remove unnecessary class

Remove extra space
2013-12-14 20:21:12 -06:00
Drew Blessing fa817dffea Add time ago tooltips to show actual date/time
Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Add helper method

change to use app helper

Modify tooltips to use new helper

Convert remaining times

Adjust one tooltip
2013-12-14 15:24:12 -06:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
Drew Blessing 63723ef6df Fix dashboard event caching 2013-12-13 13:40:45 -06:00
Dmitriy Zaporozhets b1eb3d4670 Merge branch 'fix/system_hooks_ui' of /home/git/repositories/gitlab/gitlabhq 2013-12-13 13:28:55 +00:00