home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,222 Commits 48 Branches 340 Tags
76e2564018a28f79817dfd7c1e83ab2fc0bb58bc
Commit Graph
5170 Commits
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets a7be3dfa30 Remove set of thread variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 17:51:49 +03:00
skv-headless c8e6752414 fix link to notes in merge request diff 
http://localhost:3000/gitlabhq/gitlab-ci/merge_requests/1/diffs#note_316
scroll in such links doesn't work. It happens because  on page there are 2 elements with id="note_316" in changes and discussion.
Browser takes first for scroll.
This solution works because changes loads without diffs so tag with id="note_316" just one.
Diffs loads with discussions, but in this case diff tag would be first.
It is dirty but working solution.
 2014-06-10 16:23:35 +04:00
Dmitriy Zaporozhets 476cd0f763 Merge branch 'commit-count' into 'master' 
Project commit count for default branch

Currently, the commit count displayed on a project's home page shows the total number of commits on the master branch. This can lead to situations in which a project may have no commits reported or very few if the project workflow does not involve the use of a branch named "master". Since number of commits can be an indicator of project health, showing 0 commits could make it harder to encourage adoption of a project.

This MR alters the repository model's `commit_count` method to return the count for the default branch instead of master.

See issue #299
 2014-06-10 09:59:54 +00:00
Dmitriy Zaporozhets 55440ac9be Make a comment to MR whne milestone was changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:33:17 +03:00
Dmitriy Zaporozhets 525fa6c11b Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:29:23 +03:00
Dmitriy Zaporozhets 7edf65d1ee Make a system comment when issue milestone changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:25:43 +03:00
Dmitriy Zaporozhets 9a2fec5273 Merge branch 'public-profile-info' into 'master' 
Public profile info

Show small info about your profile being publicly because you joined public project![Screenshot 2014-06-07 15.17.17](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/eecf9a0bdc/Screenshot_2014-06-07_15.17.17.png)

Fixes #1321
 2014-06-07 12:51:00 +00:00
Dmitriy Zaporozhets bcea7ba331 Merge branch 'namespace-route' into 'master' 
Namespace route

Fixes #1312
 2014-06-07 12:50:45 +00:00
Dmitriy Zaporozhets 0d13abb1c8 Specify language detection for highlight.js 
Because I am tired of CHANGELOG highlighted as sql file :)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:46:58 +03:00
Dmitriy Zaporozhets 98d697a1a6 Show small notice at profile page about publicity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:18:01 +03:00
Dmitriy Zaporozhets 3dc0bce947 Add users to /:id route 
So now when you type site/:username it redirects you to users page.
And if you type site/:groupname it redirects you to group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:06:55 +03:00
Dmitriy Zaporozhets 2aef3b00cf Refactor link to new diff note rendering 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 23:15:54 +03:00
Dmitriy Zaporozhets bc6a17a682 Smaller event width for mobile devices 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:33:52 +03:00
Dmitriy Zaporozhets 910a99f90b Improve tree view for mobile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:21:07 +03:00
Dmitriy Zaporozhets dd03841fea Make visibility icon more noticable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:09:52 +03:00
Dmitriy Zaporozhets 71d074a674 Use same color for icon, arrow and project title on dash sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:06:04 +03:00
Dmitriy Zaporozhets d325a279fb Small UI improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:01:34 +03:00
Dmitriy Zaporozhets 34d9f34a61 Improve select2 css to match bootstrap style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 21:39:30 +03:00
Dmitriy Zaporozhets 838bbb55e5 Use bootstrap default padding for nav-tabs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 20:41:42 +03:00