home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,758 Commits 48 Branches 340 Tags
v6.9.0
Commit Graph
4973 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d52a3281dc Merge branch 'small-ui-improvements' into 'master' 
Small ui improvements

* fix ugly errors block when admin save invalid user
* fix ugly errors when you tries to save invalid wiki page
 2014-05-20 15:44:45 +00:00
Dmitriy Zaporozhets 1a4c9118ae Fix UI for wiki error message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 16:22:47 +03:00
Dmitriy Zaporozhets 9eb7fe6d06 Fix admin user errors ui 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 16:21:30 +03:00
Dmitriy Zaporozhets 85c5a20352 Small UI change to milestone page so it looks similar to issue/mr 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-19 13:34:26 +03:00
Dmitriy Zaporozhets 6dfd88a145 Merge branch 'fix-group-members-search' into 'master' 
Fix group members search

Postgres only.
500 error when try to search group members on `/groups/:group_id/members` page
 2014-05-16 11:43:58 +00:00
Dmitriy Zaporozhets 52bd8d4066 Improve issue box colors. Move colors to variables for future reuse 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-16 13:47:34 +03:00
Dmitriy Zaporozhets 85cecc0b2e Fix 500 error on group members search 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-16 13:28:35 +03:00
Dmitriy Zaporozhets a3a512f2ef Hide group dashboard and project sidebar for xs size 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 16:30:50 +03:00
Dmitriy Zaporozhets 0505a88299 Hide control elements and last login for xs display 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-15 16:30:21 +03:00
Evgeniy Sokovikov 24b68fdada fix ctrl+enter note send 
use argument e instead of event
 2014-05-14 13:13:05 +04:00
Dmitriy Zaporozhets c91300e4ce Remove text-shadow from header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 19:55:03 +03:00
Dmitriy Zaporozhets d57889212b Green theme instead of dark 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 18:41:36 +03:00
Dmitriy Zaporozhets b787540f71 Change diff header bg 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 16:40:08 +03:00
Dmitriy Zaporozhets caa876af90 Improve file title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 16:01:13 +03:00
Dmitriy Zaporozhets 51280fc76c Improve violet theme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 15:15:46 +03:00
Dmitriy Zaporozhets 1f1c59b61d Merge pull request #6778 from dblessing/feature/mr_labels 
Merge Request Labels
 2014-05-13 14:43:46 +03:00
Drew Blessing 5f25cdfe19 Implement Merge Request Labels 2014-05-13 06:41:36 -05:00
Dmitriy Zaporozhets 17858d49f6 Merge pull request #6109 from jamit/master 
Added email threading for update emails on issues and merge requests
 2014-05-13 12:35:33 +03:00
Dmitriy Zaporozhets 3ea4bf4891 Merge pull request #6045 from jacargentina/fix-4305 
Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible
 2014-05-13 12:29:54 +03:00
Dmitriy Zaporozhets 0401e19558 Merge pull request #6385 from cirosantilli/72-char-commit-msg 
Commit message textareas have 72 char mark line.
 2014-05-13 12:29:28 +03:00
Dmitriy Zaporozhets 0fd12a786a Merge pull request #6825 from sue445/feature/post_automerge 
Fix can not automerge when description is too long
 2014-05-13 12:26:42 +03:00
Alex 31b0e14981 Adding project visibility to system hooks 2014-05-12 10:23:24 +01:00
sue445 a3d8be09c6 Fix can not automerge if description is too long 2014-05-11 23:50:14 +09:00
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