home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,303 Commits 48 Branches 340 Tags
06f7fd2fb75293ca2bfeb36dd0552d88a8ca855a
Commit Graph
12284 Commits
Author SHA1 Message Date
Jacob Schatz 06f7fd2fb7 Merge branch 'empty-repo-instructions-fix' into 'master' 
Users don't get instructions to push to other users empty projects

Fixes #12518

![Screen_Shot_2016-02-22_at_17.38.18](/uploads/42a3c32af1326f15a7b40fd7153a89fb/Screen_Shot_2016-02-22_at_17.38.18.png)

See merge request !2923
 2016-02-23 14:07:36 +00:00
Jacob Schatz f5be56710f Merge branch 'milestone-drag-empty-list' into 'master' 
Issues can be dragged & dropped into empty milestone lists

This is also possible with MRs. Also fixed an issue where MRs weren't sortable

Fixes #13668

![milestone](/uploads/aada0f48ce8b1407cce920eef3f4d5f3/milestone.gif)

See merge request !2935
 2016-02-23 12:39:39 +00:00
Jacob Schatz 7819420fd4 Merge branch 'dashboard-misaligned-buttons' into 'master' 
Fixed mis-aligned buttons on dashboard/issues

Before:

![](/uploads/35e413f2a5273bcdb1cc9ab20fa8d923/Screen_Shot_2016-02-22_at_10.15.39_PM.png)

After:

![Screen_Shot_2016-02-23_at_08.45.12](/uploads/4fbba0650ea6005b1cd600b5038f91d1/Screen_Shot_2016-02-23_at_08.45.12.png)


See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2921#note_3868715

See merge request !2932
 2016-02-23 12:16:25 +00:00
Jacob Schatz b323e4dcf1 Merge branch 'issue_11874' into 'master' 
Fixes dropdown appearance and makes it look accordingly to current design

Fixes #11874

See merge request !2920
 2016-02-23 12:07:14 +00:00
Phil Hughes 4eb67cdf42 Issues can be dragged & dropped into empty milestone lists 
This is also possible with MRs. Also fixed an issue where MRs weren't sortable

Fixes #13668
 2016-02-23 10:44:27 +00:00
Phil Hughes ef82e90c4b Fixed mis-aligned buttons on dashboard/issues 2016-02-23 08:44:18 +00:00
Alfredo Sumaran 8f5e1b9fb5 Do not use calc and fix background spinner for high density displays 2016-02-22 16:46:33 -05:00
Jacob Schatz 7c80998536 Merge branch 'project-type-icon-your-projects' into 'master' 
Show project visibility level on project list

Fixes #3779

![Screen_Shot_2016-02-22_at_10.08.58](/uploads/611cc8aa2d12591d4fe6a70ba0f45d68/Screen_Shot_2016-02-22_at_10.08.58.png)

See merge request !2908
 2016-02-22 20:34:31 +00:00
Jacob Schatz 54a5b8831a Merge branch 'blame-line-link' into 'master' 
Added line links to blame table

Closes #4119

See merge request !2915
 2016-02-22 20:29:38 +00:00
Rémy Coutable 493d166d66 Merge branch 'fix/13631-error-with-merged-mr' into 'master' 
Ensure we don't check a commit's description for revert message if it has no description

Fixes #13631.

/cc @razer6 @grzesiek @yorickpeterse @rdavila 

See merge request !2917
 2016-02-22 18:13:46 +00:00
Alfredo Sumaran 80fbb8af7c Use or create variables 2016-02-22 12:59:32 -05:00
Jacob Schatz 81e5c9c289 Merge branch 'fix-moving-revert-button' into 'master' 
Fixed revert button tooltip placement causing movement

Before:

![moving-tooltip](/uploads/65cb9a41e8b8114fd8ee10d68cfd8206/moving-tooltip.gif)

After:

![moving-tooltip](/uploads/a1c36eb5735dc7592c49f6b5cb1469b5/moving-tooltip.gif)

See merge request !2910
 2016-02-22 17:37:34 +00:00
Phil Hughes 62f4a9de19 Users don't get instructions to push to other users empty projects 
Fixes #12518
 2016-02-22 17:37:26 +00:00
Rémy Coutable 96ed5c5114 Ensure we don't check a commit's description for revert message if it has no description 2016-02-22 18:33:02 +01:00
Alfredo Sumaran 9c185c4361 Simpler way to place arrow 2016-02-22 12:16:42 -05:00
Jacob Schatz 96ce80d578 Merge branch 'status-indicator-size' into 'master' 
Changed the size of status indicators

![Screen_Shot_2016-02-22_at_12.53.25](/uploads/229593bf76a78a2ce658c565d805716a/Screen_Shot_2016-02-22_at_12.53.25.png)

![Screen_Shot_2016-02-22_at_12.53.36](/uploads/d328809a3288943a47bed2cf13611a03/Screen_Shot_2016-02-22_at_12.53.36.png)

Closes #12763

See merge request !2913
 2016-02-22 17:06:40 +00:00
Jacob Schatz 6fb523d2bf Merge branch 'header-overflow-small-devices' into 'master' 
Fixed issue with header overflow

Fixes #13492

Before:

![Screen_Shot_2016-02-22_at_15.32.42](/uploads/aefec4e67368d0387f22448be8eea65c/Screen_Shot_2016-02-22_at_15.32.42.png)

After:

![Screen_Shot_2016-02-22_at_15.32.09](/uploads/76b0d96cd5d9a4076c9d0883aaaba003/Screen_Shot_2016-02-22_at_15.32.09.png)

See merge request !2921
 2016-02-22 17:00:43 +00:00
Douwe Maan df1cdefe88 Merge branch 'improve-merge-when-succeeded' into 'master' 
Check the HEAD of branch when doing Merge When Succeeded

Implements https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2894#note_3845158

cc @DouweM @grzesiek 


See merge request !2907
 2016-02-22 16:51:04 +00:00
Robert Speicher 8c4cfb1fee Merge branch 'rs-mask-icon' into 'master' 
Add a Pinned Tab icon for Safari

See http://apple.co/1SCRzrw

Closes #13540

[ci skip]

See merge request !2883
 2016-02-22 16:34:46 +00:00
Alfredo Sumaran de3cdcfcd6 Delete unused CSS rule 2016-02-22 10:53:04 -05:00
Phil Hughes 7f1c26cfee Fixed issue with header overflow 
Fixes #13492
 2016-02-22 15:31:19 +00:00
Phil Hughes d14889c294 Fixed issue with content in the issue sidebar disappearing 
Closes #13626
 2016-02-22 14:58:25 +00:00
Alfredo Sumaran 983dbe2aaa Update dropdown menu style 2016-02-22 09:58:04 -05:00
Jacob Schatz 5803a5308f Merge branch 'issue_13463' into 'master' 
Fix Side-by-side view after loading diff results

Fixes #13463

See merge request !2880
 2016-02-22 14:35:06 +00:00
Phil Hughes 416b49d3f0 Changed the size of status indicators 
Closes #12763
 2016-02-22 14:11:41 +00:00
Phil Hughes fbc578a7ec Added line links to blame table 
Closes #4119
 2016-02-22 14:09:13 +00:00
Phil Hughes aa1ac6368e Fixed revert button tooltip placement causing movement 2016-02-22 12:55:28 +00:00
Phil Hughes 7bdddb481d removed merge-request-no-votes css class 2016-02-22 11:50:26 +00:00
Phil Hughes 51c17329a4 Fixed failing issues tests 
Removed up/down vote icons from merge requests. Was missed from d8069bd858
 2016-02-22 11:35:52 +00:00
Phil Hughes d8069bd858 Only show up or down votes icon on issue list if there are any 
Closes #13649
 2016-02-22 10:21:02 +00:00
Phil Hughes 49a95d9858 Show project visibility level on project list 
Fixes #3779
 2016-02-22 10:08:44 +00:00
Kamil Trzcinski 7c288c07f1 Check the HEAD of branch when doing Merge When Succeeded 2016-02-22 10:34:09 +01:00
Douglas Barbosa Alexandre 04d1b41258 Merge branch 'tasks' into 'master' 
Add Todos

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2425

Tasks:

-  Prepare database
 - [X] Create a new table (`todos`)
- Tasks Queue view
 - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page
 - [X] Add a chronological list of todos, with the 'Todos' tab active by default
 - [X] Add a 'Done' button to each todo
 - [x] Add filters (project, author, type, and action)
- Todos generation
 - [X] When user issue/mr is assgined to someone
 - [x] When user is mentioned on (issues/mr's/comments)
- Mark todo as `done`
 - [X] When clicks on the 'Done' button
 - [X] When edit issue/mr
 - [X] When left/edit a comment
 - [X] When reassign issue/mr
 - [X] When add/remove labels to issue/mr
 - [X] When issue/mr is closed
 - [X] When mr is merged
 - [X] When added an emoji
 - [X] When changed the issue/mr milestone

* Screenshot:

![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png)

See merge request !2817
 2016-02-22 02:36:41 +00:00
Douwe Maan 28f9b54372 Merge branch 'merge-when-succeeded' into 'master' 
Fix bugs in MergeWhenSucceeded

1. This fixes support for merge when succeeded for statuses without ref.
2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269

/cc @grzesiek @DouweM @rspeicher 


See merge request !2894
 2016-02-22 00:38:51 +00:00
Alfredo Sumaran 42b277eceb Make select2 design consistent 2016-02-21 19:02:31 -05:00
Douglas Barbosa Alexandre f37765efa2 Use before_action instead of before_filter 2016-02-21 12:52:37 -03:00
Jacob Schatz 1367caa642 Merge branch 'award-emoji-retina' into 'master' 
Award emoji supports retina displays

Based on discussion in !2800

There is now a retina spritesheet for emojis. It is 2mb, don't know how big an issue that is.

Before:

![Screen_Shot_2016-02-19_at_11.07.25](/uploads/ea412579bcaddfd13fce67bf583de61b/Screen_Shot_2016-02-19_at_11.07.25.png)

After:

![Screen_Shot_2016-02-19_at_11.07.36](/uploads/9d44c6278ba31987bad03dc1f46edd8b/Screen_Shot_2016-02-19_at_11.07.36.png)

Also updated the rake task to make the @2x spritesheet https://gitlab.com/snippets/15348

cc\ @rspeicher @vsizov 

See merge request !2891
 2016-02-20 20:38:27 +00:00
Douwe Maan 42cbcb2347 "X assigned you Y" instead of "X assigned Y" 2016-02-20 12:01:55 -08:00
Douwe Maan d53ae7f14d Add "Mark all as done" button 2016-02-20 11:59:19 -08:00
Douwe Maan 57d16552ff Include 'issue'/'merge request' in link 2016-02-20 11:53:15 -08:00
Douwe Maan 0e9775816a Rename tab from 'Todos' to 'To do' 2016-02-20 11:52:57 -08:00
Yorick Peterse e0cb3212ed Flush emptiness caches whenever needed 
This ensures that the emptiness cache (used for Repository#empty? and
Repository#has_visible_content?) is flushed after comitting changes
(using the web editor, API or Git) for new repositories. Once a
repository is no longer empty there's no need to explicitly flush the
cache for Repository#empty?. The cache for
Repository#has_visible_content? in turn is already flushed whenever
needed.

Fixes gitlab-org/gitlab-ce#13387
 2016-02-20 20:17:50 +01:00
Douglas Barbosa Alexandre f42b1fa6e5 Fix rubucop offenses 2016-02-20 13:10:37 -02:00
Douglas Barbosa Alexandre 3d52e139b1 Rename Tasks to Todos 2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre 408e010d65 Rename IssuableBaseService#have_changes? to has_changes? 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre a7dee0ab01 Refactoring TasksHelper 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre d80678c0da Improve tasks page list UI 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre ce78813c2a Create or mark task pending as soon the action happens 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre a57bf9bd39 Rename menu item and page 'Task queue' to 'Tasks' 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre fc3f8a8ff7 Ensure that we only have one task per issue/mr 2016-02-20 12:12:05 -02:00