home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
4837 Commits
Author SHA1 Message Date
Sullivan SENECHALandSullivan SENECHAL d365004e68 Fix and improve help rendering 2015-04-03 11:56:50 +02:00
Douwe Maan e62b5a2b07 Only allow user to see participants from groups they have access to. 2015-04-02 10:57:01 +02:00
Stan Hu dfd256f29e Support configurable attachment size via Application Settings 
Fix bug where error messages from Dropzone would not be displayed on the issues page

Closes #1258
 2015-04-02 00:04:08 -07:00
Sullivan SENECHAL 15fc957163 Bootlint integration 2015-04-01 21:33:22 +02:00
Marin Jankovski d77f333f9c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 
Conflicts:
	lib/gitlab/markdown.rb
 2015-03-31 19:03:54 -07:00
Marin Jankovski 96d093e59a Merge branch 'email-full-url' 2015-03-31 19:00:59 -07:00
Dmitriy Zaporozhets 0622b87537 Merge branch 'admin-user-projects' into 'master' 
Fix admin user projects lists.

The admin user personal projects lists wasn't being rendered anymore.

cc @marin

See merge request !442
 2015-04-01 00:44:09 +00:00
Dmitriy Zaporozhets a9af64855d Merge branch 'refactor-milestones' into 'master' 
Better looking milestone lists

### Before

![milestone-before](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1366ade74d76b067fdc8707d31d2bffc/milestone-before.png)

### After

![milestone-after](https://gitlab.com/gitlab-org/gitlab-ce/uploads/80ae1c1f77eae5dff8ee61c4271bec17/milestone-after.png)

See merge request !484
 2015-04-01 00:37:39 +00:00
Dmitriy Zaporozhets 6a790b7963 Better looking milestone lists 2015-04-01 02:45:47 +03:00
Phil Hughes 6fe26e3e46 Removed help link from sidebar 2015-03-31 17:49:19 +01:00
Douwe Maan 08eac512bd Move EmailsOnPush highlight CSS inline instead of being in every notification email. 2015-03-31 12:36:36 +02:00
Fotis Gimian cbe9654abe Disable turbolinks for omniauth link to avoid rendering problems 2015-03-31 21:04:47 +11:00
Douwe Maan 33a8f53f7a Merge branch 'file-commit-list' into 'master' 
Fixed issue where only 25 commits would load in file listings

Fixes #1310

See https://gitlab.com/gitlab-org/gitlab-ce/tree/master and it will only show the first 25 files commit messages.

See merge request !477
 2015-03-31 08:24:18 +00:00
Douwe Maan 2d5f4458a0 Fix admin user projects lists. 2015-03-31 09:19:08 +02:00
Dmitriy Zaporozhets 64c89e6012 Merge branch 'commits-count-badge' into 'master' 
Added badge to commits tab

Fixes #1261

See merge request !465
 2015-03-30 21:52:26 +00:00
Phil Hughes 4d7cd4f329 Added badge to commits tab 2015-03-30 22:46:01 +01:00
Dmitriy Zaporozhets b7e2be247f Fix adding new members to group 2015-03-30 14:17:49 -07:00
Phil Hughes 82db3dc8b0 Fixed issue where only 25 commits would load in file listings 2015-03-30 19:31:13 +01:00
Dmitriy Zaporozhets 9d6ffcfa5f Refactor star btn logic for non-logged in user and fix tests 2015-03-29 18:50:45 -07:00
Dmitriy Zaporozhets 405f91d2b8 Refactor star/fork buttons 2015-03-29 18:15:54 -07:00
Dmitriy Zaporozhets 6b9f1e1a9f Merge branch 'file-type' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-file-type 2015-03-29 17:23:53 -07:00
Dmitriy Zaporozhets 57a49b340e Merge branch 'repo-buttons' into 'master' 
Repo buttons

Fixes #796

Moved the star & fork button to inline with the other buttons.

See merge request !473
 2015-03-29 17:21:31 +00:00
Phil Hughes 6920fd3ddd Alignment fixes for repo buttons 2015-03-29 12:56:45 +01:00
Phil Hughes 7652510c6b Moved download button into sidebar 
Star and fork buttons moved up
 2015-03-29 12:23:56 +01:00
Dmitriy Zaporozhets ccab346a78 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-29 03:32:28 -07:00
Dmitriy Zaporozhets 5f3a758721 Merge branch 'fix-plain-diffs' into 'master' 
Remove the email patches link for merge commits

Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches.  This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit.  Together these changes should prevent the 500 errors described in the issue.

cc @sytse

See merge request !1737
 2015-03-29 10:32:27 +00:00
Sullivan SENECHAL 8ef7220c23 Improve file icons rendering on tree 2015-03-28 16:49:05 +01:00
Robert Schilling db948ff3d6 Merge pull request #9043 from skburgart/fix/merge-wording 
Change merging notification to sound more natural
 2015-03-28 09:37:18 +01:00
Dmitriy Zaporozhets 6664da431a Small css improvements to selectboxes and issue filter 2015-03-27 14:28:24 -07:00
Steven Burgart 83064492a0 Change merging notification to sound more natural 2015-03-27 15:50:54 -04:00
Dmitriy Zaporozhets 70496fe5d8 Improve UI for issues filters 2015-03-27 12:00:31 -07:00
Douwe Maan e08d947e77 Use relative URL for Markdown references, except in mails. 2015-03-27 10:39:05 +01:00
Dmitriy Zaporozhets c1c93f4f7a Fix tests and unassigned filter for issues. Updated CHANGELOG 2015-03-27 00:27:51 -07:00
Phil Hughes 79bd8ca989 Changed button type 2015-03-27 07:06:38 +00:00
Dmitriy Zaporozhets d6c8eefb5d Big refactoring of issues filters 
* Squash project users selectbox and users selectbox into one class
* Move from API autocomplete to GitLab internal one
* Smarter filter for project/group/all issues
* Use selectbox with searchbox for assignee/author/milestone/label
* Switch to ajax filter for issue author/assignee
 2015-03-26 19:13:49 -07:00
Phil Hughes 91b108192c Fork/Star button re-design 2015-03-26 19:38:20 +00:00
Dmitriy Zaporozhets b8164321fe Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-26 08:56:00 -07:00
Dmitriy Zaporozhets ff23209aec Merge pull request #9029 from tsigo/rs-project-admin 
Add archived status to Admin > Project page
 2015-03-26 08:55:22 -07:00
Dmitriy Zaporozhets 7842a81569 Merge branch 'capitalize-js-class' into 'master' 
Capitalize js class name

See merge request !457
 2015-03-26 15:40:34 +00:00
Dmitriy Zaporozhets 366ce781b3 Remove unused doorkeeper layout 2015-03-25 23:16:43 -07:00
Dmitriy Zaporozhets 0b355aba02 Replace alerts with well where alert is not needed 2015-03-25 23:07:59 -07:00
Dmitriy Zaporozhets 80fd8f2de1 Capitalize js class name 2015-03-25 22:22:10 -07:00
Dmitriy Zaporozhets a1d09190e3 Prevent unnecessary doubling of js events on import pages and user calendar 2015-03-25 21:45:01 -07:00
Dmitriy Zaporozhets 8b7aedad2b Prevent doubling AJAX request with each commit visit via Turbolink 2015-03-25 15:47:31 -07:00
Robert Speicher c31d40e358 Update the "Edit Group" button class on Project Admin page 2015-03-25 17:37:05 -04:00
Robert Speicher 3008096106 Add archived status to Admin > Project page 2015-03-25 17:37:05 -04:00
Dmitriy Zaporozhets f2ea9d9f3f Improve sticky headers in diffs 
* disable sticky headers in discussion
* enable sticky header on mr page with you click changes tab
 2015-03-24 19:00:00 -07:00
Dmitriy Zaporozhets b9372c9997 Merge branch 'milestone_and_labels_links' into 'master' 
Milestones and labels can be used even when issues are disabled.

When Issues are disabled for a project Milestones and Labels can still be used for Merge Requests.

See merge request !1739
 2015-03-25 01:02:34 +00:00
Dmitriy Zaporozhets 2993e2801a Merge branch 'note-avatar-link' into 'master' 
Link note avatar to user.

See merge request !446
 2015-03-24 23:40:19 +00:00
Dmitriy Zaporozhets 0d50a65b32 Fix diff header in discussion blocks 2015-03-24 16:27:40 -07:00