Commit Graph
4837 Commits
Author SHA1 Message Date
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
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 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 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 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
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 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 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 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 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 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
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
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
skv 20b2102771 notes count in 1 query for mr and commits 2014-06-10 16:10:53 +04: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 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 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 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 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 ffd50e8cf5 Add merged mrs list to milestone page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-05 16:28:13 +03:00
Dmitriy Zaporozhets 336d50d008 Merge request drag-n-drop on milestone page
Allows moving milestone between 3 columns: unassigned, assigned,
declined

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-05 13:01:49 +03:00
Dmitriy Zaporozhets 868629dc40 Merge pull request #7077 from bbodenmiller/patch-2
improve no projects screen
2014-06-05 10:12:27 +03:00
Dmitriy Zaporozhets bb36768941 Merge branch 'milestone-issues-dragging' into 'master'
Milestone issues dragging

This is part of #1207.
I will submit this feature with small but finished merge requests.
2014-06-05 07:08:18 +00:00
Dmitriy Zaporozhets 248a3e5688 Fix help page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-05 09:39:03 +03:00
Dmitriy Zaporozhets 9654b098c6 Milestone drag-n-drop with 3 columns
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-05 09:29:24 +03:00
Ben Bodenmiller 829c7282a3 improve no projects screen
* correct odd capitalization pattern in tagline
* remove "click on button" statement as telling a user to click something is not a good web development practice
* add missing period for consistency
2014-06-04 18:14:31 -07:00
Dmitriy Zaporozhets eeef2c7350 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-04 20:39:43 +03:00
Dmitriy Zaporozhets f1ec62f465 Add reopened tab to milestone issues. Add ids and data to milestone issues to enable dragging
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-04 18:52:35 +03:00
Dmitriy Zaporozhets d986aea3f0 Merge branch 'upgrade_to_rails_4.1' into 'master'
Upgrade to rails 4.1
2014-06-04 07:33:25 +00:00
Marin Jankovski 18b1f171bd Rename snippets scopes to plural names. 2014-06-04 08:37:19 +02:00