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
Gregoire Daussin ea696805a7 Fix css rules conflict between .dark & a.dark classes 2014-05-09 17:58:23 +02:00
Dmitriy Zaporozhets 23ae3911aa Merge branch 'mixin-cleanup' into 'master' 
Mixin cleanup

* Remove old mixins
* add issue box shadow
* change color for network graph box
 2014-05-08 20:01:52 +00:00
Dmitriy Zaporozhets 058c48845b Merge branch 'fix_merge_request_emails' into 'master' 
Remove markdown syntax from notification emails

Merge request notifications once again gained markdown syntax 😄 In my opinion, markdown should not be present in emails because it is not rendered - it looks funny. I fixed this once before in 57ad81a9c5 and it was recently changed back to use the markdown style.
 2014-05-08 18:36:32 +00:00
Dmitriy Zaporozhets 4ca1a29de8 Merge pull request #6934 from skv-headless/ctrl_enter_form_submit 
submit notes forms by pressing ctrl+enter
 2014-05-08 21:31:25 +03:00
Dmitriy Zaporozhets aa5f306d11 Merge pull request #6860 from hszcg/dev 
Add support for side-by-side inline comments
 2014-05-08 21:23:44 +03:00
Dmitriy Zaporozhets 211e975d8a Change header color in network page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 21:10:20 +03:00
Dmitriy Zaporozhets 2ec1a879f7 Add box shadow to issue box 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 21:10:07 +03:00
Dmitriy Zaporozhets 20be9ef251 Remove old mixins 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 21:09:51 +03:00
Dmitriy Zaporozhets 536373ad05 Dont allow mr compare with empty branches 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 19:00:03 +03:00
Dmitriy Zaporozhets 86bf684f5d Minor UI improvements and fixed test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 16:30:39 +03:00
Dmitriy Zaporozhets 2da289cf22 Add assignee and milestone to 2nd step 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:52:59 +03:00
Dmitriy Zaporozhets ee3cd06f4c Remove unnecessary css margin 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:40:19 +03:00
Dmitriy Zaporozhets 51e976d295 Add assignee/milestone block to merge request edit page. And remove branches selector from this page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:40:02 +03:00
Dmitriy Zaporozhets 8eae01ea58 Compare branches in MergeRequestsController#new action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:38:52 +03:00
Dmitriy Zaporozhets 05e63fe09c MergeRequest#new 2 step process 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:38:17 +03:00
Dmitriy Zaporozhets 23de3551ab Add MergeRequest#target_project_namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:37:36 +03:00
skv-headless a8624cbe59 submit notes forms by pressing ctrl+enter 2014-05-07 17:50:56 +04:00
Dmitriy Zaporozhets 4fea8afc4b Add CompareAction class for collecting commits and diffs using satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 16:14:24 +03:00
Dmitriy Zaporozhets dd3a55064e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-07 14:57:26 +03:00
Dmitriy Zaporozhets 97eb2240b1 Fix check-all issues checkbox position 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 14:52:43 +03:00
Dmitriy Zaporozhets 18529269c6 truncate long branch names on MR index 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 14:43:07 +03:00
Dmitriy Zaporozhets c9104fa6e4 Fix search dropdown css. Improve jquery styles 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 14:26:49 +03:00
Dmitriy Zaporozhets fa7d0e3ae0 Fix MR widget UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 12:21:02 +03:00
Dmitriy Zaporozhets 118d06a3e2 Merge branch 'mobile_menu_help' into 'master' 
Fix mobile menu after adding help link

After https://github.com/gitlabhq/gitlabhq/pull/6897 the mobile menu ran off the left side of the screen. I don't see much we can do to squeeze all the items into mobile's width. I think hiding one of the items is acceptable and which is a matter of opinion.  I suggest hiding the user's avatar on mobile but the search icon or help icon would both be options as well. Let me know if you want a different icon hidden on mobile.

[Before Screenshot](https://www.dropbox.com/s/hnfmaln3ilcy0p7/Screen%20Shot%202014-05-02%20at%205.17.28%20PM.png)
[After Screenshot](https://www.dropbox.com/s/3ifxa8gfa12h37h/Screen%20Shot%202014-05-05%20at%204.52.25%20AM.png)
 2014-05-06 15:19:53 +00:00
Dmitriy Zaporozhets 5ce1418406 Merge pull request #6799 from Datacom/bug/parallel_diff_missing_lines_pr 
Fix missing lines in Parallel Diff
 2014-05-06 15:34:33 +03:00
Dmitriy Zaporozhets e640481625 Merge branch 'files_in_wiki' into 'master' 
Add support to show files from wiki repository on wiki pages
 2014-05-06 10:21:05 +00:00
Philip Blatter 11bedfe37d Now using correct ids as reference if we are informing about a new note. 2014-05-05 21:48:49 +02:00
Philip Blatter 06bed543e6 Added email threading for update emails on issues and merge requests (if the mail client support the References: mail header) 2014-05-05 21:46:51 +02:00
Marin Jankovski fac225780c A bit clearer naming for gollum_wiki. 2014-05-05 14:01:48 +02:00
Drew Blessing ad0f5fdc27 Improve mobile UI for issues and merge requests 2014-05-05 05:03:37 -05:00
Marin Jankovski 4146e885dd Fix styling issues. 2014-05-05 11:55:49 +02:00
Drew Blessing d210484205 Fix mobile menu after adding help link 2014-05-02 17:14:58 -05:00
Dmitriy Zaporozhets 993fc84855 Use sign icon style for help link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 22:00:23 +03:00
Dmitriy Zaporozhets c608a5dcea Add sort dropdown for admin projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 17:02:57 +03:00
Dmitriy Zaporozhets 9dfc4fe6ac Merge branch 'repo-size-in-db' into 'master' 
Save repository size to projects table

This will allow us to get largest repos by simple sql query.

Also it increase loading of `admin/projects` page a lot because right now it calculate 20x project sizes per page
 2014-05-02 13:48:26 +00:00
Dmitriy Zaporozhets d10b34a685 Save repository size to projects table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 16:05:08 +03:00
Dmitriy Zaporozhets 0242124525 Fix 404 on jquery ui images 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 14:48:32 +03:00
Dmitriy Zaporozhets 7660290b37 Merge pull request #6892 from cirosantilli/remove-signin-link-front-page 
Remove redundant signin link from signin page.
 2014-05-01 22:58:48 +03:00
Alexander Mills cc9b7cba38 Updated CI error message so that it makes more sense 2014-05-01 15:42:28 +01:00
Dmitriy Zaporozhets d4b4088321 Merge pull request #6897 from cirosantilli/help-every-page 
Add help link to header.
 2014-05-01 11:58:55 +03:00
Ciro Santilli 469077e55d Add help link to header. 2014-05-01 09:14:52 +02:00
Dmitriy Zaporozhets 86726662e7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-01 09:06:04 +03:00
Marin Jankovski cb69baedd3 Remove empty line. 2014-04-30 11:48:46 +02:00
Jacob Vosmaer 0b914e7ceb Refresh notes when the page becomes visible 2014-04-29 17:21:58 +02:00
Jacob Vosmaer e52f50c22f Do not refresh notes on hidden tabs 2014-04-29 17:21:58 +02:00
Dmitriy Zaporozhets 9eeb96846f Merge pull request #6877 from Nighoo/repository_push_email.text 
do not html encode plaintext part of emails for push notifications
 2014-04-29 18:07:55 +03:00
Dmitriy Zaporozhets dba913aa38 Merge pull request #6876 from dblessing/fix_broadcast_text 
Fix unclear text in broadcast message view.
 2014-04-29 18:07:26 +03:00
Ciro Santilli 513dbdbff3 Remove redundant signin link from signin page. 2014-04-29 11:49:42 +02:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview 
editing preview
 2014-04-29 10:00:29 +03:00
Drew Blessing 17b3da07ce Remove markdown notation from notification emails 2014-04-28 14:33:17 -05:00