home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9be5425a88 Refactor snippets views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 12:36:46 +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
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 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 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 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Jeroen van Baarsen 87760a290e Added an UrlBuilder for building rails named routes 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-13 12:34:15 +02:00
Jeroen van Baarsen 45e1941fb3 Return a little more information in Issue webhook 
When a webhook for issues is triggered, it should also return the
resource URL, and the action that was performed (ie: Was it reopened,
updated, opened or closed)
 2014-06-13 12:14:43 +02:00
Jacob Vosmaer 8761dd2a6f Check LDAP user filter during sign-in 2014-06-13 08:14:34 +02:00
Dmitriy Zaporozhets afe47e26f5 Add autolink to project/group description render 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 22:58:59 +03:00
Dmitriy Zaporozhets 92ccc687b0 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-12 22:39:31 +03:00
Dmitriy Zaporozhets 6c6cdd23ff Prevent timeout for Commits#stats page for huge repos 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 22:24:19 +03:00
Dmitriy Zaporozhets 5d9feb60c3 Merge pull request #7123 from skv-headless/fix_double_check_all_issues 
fix double check for all issues
 2014-06-12 22:10:23 +03:00
Dmitriy Zaporozhets 1bde927750 Restyle git tags page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 22:08:54 +03:00
Dmitriy Zaporozhets 98416ec9ab Show proper message for new MR when satellite fails 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 21:49:45 +03:00
Dmitriy Zaporozhets c827af21d3 Remove unnecessary padding 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 21:49:02 +03:00
skv-headless 1f3a69c1d1 fix double check for all issues 2014-06-12 22:39:08 +04:00
Dmitriy Zaporozhets 6e2a75df8e Dont truncate project names on group page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 16:16:29 +03:00
Dmitriy Zaporozhets fcb0b76c32 Load last commit for files per 10 items. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 12:01:54 +03:00
Dmitriy Zaporozhets 7ed935b676 Use gitlab_git to get commit_count in repo. It allows get commits count for git repos with 100k+ commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 23:13:31 +03:00
CSchulz ac0763ac7a Added update repository size to repository import 2014-06-11 19:32:00 +00:00
Dmitriy Zaporozhets afa4a075e4 Show spinner on network graph while it loading 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 22:22:58 +03:00
Dmitriy Zaporozhets e740a00ed6 Prevent commit page error if cant collect branches where commit exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 22:08:39 +03:00
Dmitriy Zaporozhets 0b00b3dac3 Add sorting to merge requests on milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 17:11:52 +03:00
Dmitriy Zaporozhets ed610043a8 Merge branch 'milestone-issue-position' into 'master' 
Milestone issues sorting

Now issues save sort position inside milestone lists

Part of #1207
 2014-06-11 12:14:44 +00:00
Dmitriy Zaporozhets f881e43677 Merge pull request #7024 from skv-headless/linkto_issues_on_main_dashboard 
links to issues on main dashboard
 2014-06-11 15:02:48 +03:00
Dmitriy Zaporozhets f82d0d8d58 Merge pull request #6940 from skv-headless/mr-diff-note-scroll-fix 
fix link to notes in merge request diff
 2014-06-11 14:25:19 +03:00
Dmitriy Zaporozhets dd86ce3f06 Sort issues in milestone 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 14:09:45 +03:00
Marvin Frick 587502390b fixes gitlab.com issue #229 
Changes .js.coffe files to not use a hardcoded path to
`no_avatar.png` but instead stick with the asset pipeline.

renames coffee.erb back to coffee
 2014-06-10 22:28:11 +02:00
Dmitriy Zaporozhets 1f5891e991 Use more compact bordered-list for commits page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 22:01:56 +03:00
Dmitriy Zaporozhets 8aac4fadba Small ui fixes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 21:57:05 +03:00
Dmitriy Zaporozhets de55d7aa57 issue-box content can be shown on sm devices easily 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 20:59:51 +03:00
Dmitriy Zaporozhets 1c23333f34 Align issue box content and mr widgets vertically 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 20:59:26 +03:00
Dmitriy Zaporozhets 9d09d616af Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-06-10 19:48:38 +03:00
Dmitriy Zaporozhets f6ee55aabd Fix issue/mr close/reopen via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 19:23:02 +03:00
Dmitriy Zaporozhets d65bf4605e Fix milestone reopen 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 19:22:39 +03:00
Pierre de La Morinerie de90b572d8 Allow more mail clients to group emails by thread 
* send a ‘In-Reply-To’ header along the ‘References’ header
* subject of answers to an existing thread begins with ‘Re: ’

This fixes threading with at least Mail.app and Airmail.
 2014-06-10 17:09:15 +02:00
Pierre de La Morinerie 466b768bb3 Send notification emails to the "project", and put people in Cc 
This fixes email threading in Mail.app, that doesn't like when a thread
doesn't have stable recipients.

For instance, here is a possible sender-recipient combinations before:

From: A
To: Me
New issue

From: B
To: Me
Reply on new issue

From: A
To: Me
Another reply

Mail.app doesn't see B as a participant to the original email thread,
and decides to break the thread: it will group all messages from A
together, and separately all messages from B.

This commit makes the thread look like this:

From: A
To: gitlab/project
Cc: Me
New issue

From: B
To: gitlab/project
Cc: Me
Reply on new issue

From: A
To: gitlab/project
Cc: Me
Another reply

Mail.app sees a common recipient, and group the thread correctly.
 2014-06-10 17:09:15 +02:00
Dmitriy Zaporozhets c4b02642d2 Replace milestone observer with services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 18:07:52 +03:00
Dmitriy Zaporozhets f8ea52c3a0 Remove thread vars usage from API notes and mr's 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 17:56:35 +03:00