home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,271 Commits 48 Branches 340 Tags
f31f101d364ea51bb32a7ed0c8a66ccff7811a15
Commit Graph
10271 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij f31f101d36 Merge pull request #6831 from pkill/better-email-on-push-subject 
Provide better email subject lines from email on push service
 2014-06-16 08:21:46 +02:00
Alex Elman e6722cb178 Provide better email subject lines from email on push service 
If one commit is pushed, display the commit message in the subject
line. Otherwise display the number of commits pushed to the repository.
 2014-06-15 09:53:00 -05:00
Sytse Sijbrandij 46e33ed371 Merge pull request #7132 from pkgr/pkgr 
Enable CentOS packaging.
 2014-06-15 14:33:51 +02:00
Dmitriy Zaporozhets d74bf464d3 Postgres requires not-null value for boolean field 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-15 09:40:24 +03:00
Dmitriy Zaporozhets dbb7610365 Merge branch 'responsive-sidebar' into 'master' 
Responsive sidebar fixes

This fixes two major issues with the responsive sidebar

1. Overlapping content by the label:
The label and sidebar is now always on the right side of the screen. This makes it always easy to find (better UX) and prevents it from overlapping most content. Additionally, on xs screens, instead of the side-attached label, for some pages it will show an extra button in the head instead of a buttons that overlaps.

2. Pop up of sidebar on changing pages.
 2014-06-15 06:02:12 +00:00
Dmitriy Zaporozhets 8000fb44b7 Merge branch 'file-mode-changed' into 'master' 
Show file mode changes on commit page

## Before:

![Screenshot 2014-06-14 22.55.18](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/3f89dfa841/Screenshot_2014-06-14_22.55.18.png)

## After:

![Screenshot 2014-06-14 22.54.11](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/5e7550d595/Screenshot_2014-06-14_22.54.11.png)
 2014-06-14 20:47:55 +00:00
Job van der Voort 204fee4f41 move all sidebars to one side for improved UX; add button in head of projects/issues and milestones instead of tab on side of screen to prevent overlapping of content 2014-06-14 22:44:23 +02:00
Dmitriy Zaporozhets d29bb23a68 Update gitlab-grit to newer version with normal diff collection. Show if file mode was changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 22:54:56 +03:00
Dmitriy Zaporozhets b48bb4a77c Change mode for view files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 20:35:40 +03:00
Dmitriy Zaporozhets 9e21e96b2a Fix dashboard "show more project" link padding 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 20:33:12 +03:00
Dmitriy Zaporozhets 72f0a6b286 Fix blob breadcrumb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 20:01:56 +03:00
Dmitriy Zaporozhets 56cb6d8899 Fix help css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:58:54 +03:00
Dmitriy Zaporozhets 52b7fa248a Darker color for page title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:55:26 +03:00
Dmitriy Zaporozhets 869809a1cf Remove failing test on travis+pg 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:41:32 +03:00
Dmitriy Zaporozhets 3637d244be Improve network UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:35:45 +03:00
Dmitriy Zaporozhets 951279b1a3 Improve tree view for iPad 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:09:36 +03:00
Dmitriy Zaporozhets 55795b7c29 Improve breadcrumbs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:02:16 +03:00
Dmitriy Zaporozhets 1555146adf Merge branch 'responsive-sidebar' into 'master' 
Responsive sidebar

Puts the sidebar on the dashboard in a off-screen sidebar that can be called by pressing a button with a fixed position.

Any sidebar with the .responsive-sidebar class will follow this behavior. Button must be added manually.
 2014-06-14 13:50:30 +00:00
Dmitriy Zaporozhets 228386d15d Merge branch 'cleanup-help' into 'master' 
Cleanup help

Remove a lot of unused help files.
Apply `wiki` css to help content
 2014-06-14 13:50:15 +00:00
Dmitriy Zaporozhets 6a7990c007 Remove garbage and apply wiki style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 15:51:07 +03:00
Job van der Voort 9c843041fa add responsive sidebar to issues, milestones and MRs 2014-06-14 14:32:41 +02:00
Dmitriy Zaporozhets 68e4df7065 Merge branch 'ui-ux-improvements' into 'master' 
UI/UX improvements
 2014-06-14 10:30:53 +00:00
Cyril Rohr 0b7f83ad7e Enable CentOS packaging. 2014-06-14 11:26:07 +01:00
Dmitriy Zaporozhets 054d68a3e9 Improve MR message for huge diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 12:58:08 +03:00
Dmitriy Zaporozhets 49506fc71a Merge remote-tracking branch 'origin/issue_closing_widget' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-06-14 12:40:42 +03:00
Dmitriy Zaporozhets 55d4e2647d Merge branch 'ce_issues_sentence' into 'master' 
Issues sentence helper

This will make merging CE into EE later easier.
 2014-06-14 09:39:19 +00:00
Dmitriy Zaporozhets 87fd342a23 Merge branch 'more-secure-api' into 'master' 
More secure api

Dont expose user email via API. Fixes #1314
 2014-06-14 09:39:01 +00:00
Dmitriy Zaporozhets 9be5425a88 Refactor snippets views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 12:36:46 +03:00
Dmitriy Zaporozhets 600f4c6894 Fix snippet dev fixtures 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 12:36:31 +03:00
Job van der Voort d718209b47 responsive sidebar on dashboard 2014-06-14 11:18:00 +02:00
Job van der Voort 8b6dd9d4a8 responsive sidebar 2014-06-14 11:17:11 +02:00
Dmitriy Zaporozhets eb7845682d Improve files/snippets action buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 20:21:48 +03:00
Dmitriy Zaporozhets 47d6f70528 Add /api/users test for admin role. Updated CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 19:42:17 +03:00
Dmitriy Zaporozhets 8ff171f628 Fix api specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 19:39:12 +03:00
Dmitriy Zaporozhets e8f222e39c Fix helper specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 19:35:21 +03:00
Jacob Vosmaer d698535854 Add a test for issue sentence generation 2014-06-13 18:10:28 +02:00
Dmitriy Zaporozhets 2af8ace1dc Small UI fixes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 18:40:37 +03:00
Jacob Vosmaer 3f1ece2690 Detect closing issues in Merge Request description 2014-06-13 17:25:44 +02:00
Dmitriy Zaporozhets 342b7b62c4 Merge branch 'git-2-docs' into 'master' 
Git 2 docs

Related to #1318
 2014-06-13 15:09:32 +00:00
Dmitriy Zaporozhets a7345e368a Fix gravatar size and update docs for new users API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 18:02:42 +03:00
Dmitriy Zaporozhets ae564c97d4 Dont expose user email via API 
To prevent leaking of users info we reduce amount of user information
retrieved via API for normal users.

What user can get via API:

* if not admin: only id, state, name, username and avatar_url
* if admin: all user information
* about himself: all informaion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 17:46:48 +03:00
Dmitriy Zaporozhets d5b0f29c4a Move gravatar url compose to separate service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 17:11:46 +03:00
Dmitriy Zaporozhets 5fdcaadf34 Merge branch 'fix-new-mr-502' into 'master' 
Fix 502 error on new merge request page

When diff is huge we try to render it that cause 502 error often.
After this patch we apply soft limits to diffs. So if diff is huge - we doing show it

Fixes #1323
 2014-06-13 13:15:41 +00:00
Dmitriy Zaporozhets 273093a9b4 Small ui fix 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 15:35:20 +03:00
Dmitriy Zaporozhets 15c27192c0 Merge branch 'remove-wall' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-06-13 15:19:14 +03:00
Dmitriy Zaporozhets d3d0775acd Exclude info rows from milestone sorting items 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 15:18:23 +03:00
Dmitriy Zaporozhets 76e2564018 Recommend setup git 2.0 for installation docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 15:10:58 +03:00
Dmitriy Zaporozhets 59e1819561 Apply soft diff limits to MergeRequest#new page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 15:00:35 +03:00
Dmitriy Zaporozhets 04e8b5184f Merge branch 'check_ldap_filter' into 'master' 
Check LDAP user filter during sign-in
 2014-06-13 11:42:17 +00:00
Dmitriy Zaporozhets d593c98fcb Delete wall notes tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:29:26 +03:00