home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,538 Commits 48 Branches 340 Tags
5a1706791e46fd69a67fcdebfc384a702b00a7ff
Commit Graph
349 Commits
Author SHA1 Message Date
Jacob Schatz b3431a8ce8 adds hover titles to merge request and issue pages 2016-01-11 12:50:01 -05:00
Dmitriy Zaporozhets f41b535ced Merge branch 'fix-build-status-caching' into 'master' 
Fix caching issue where build status was not updating in project dashboard

The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable.

Closes #3268

See merge request !2353
 2016-01-11 12:10:33 +00:00
iqualisoni e304a76eb6 Issue #5817 wording of the web hooks updated on issue and merge events 2016-01-11 01:02:27 -02:00
Stan Hu d5c8f1fdde Fix caching issue where build status was not updating in project dashboard 
Closes #3268
 2016-01-08 16:08:10 -08:00
Jacob Schatz b284ba24c2 changes verb references to noun reference. 2016-01-08 13:08:57 -05:00
Jacob Schatz 60aedb46d9 adds reference to the bottom of sidebar 2016-01-07 15:18:07 -05:00
Dmitriy Zaporozhets 525f8fb4fb Merge branch 'rs-logo-animation' into 'master' 
Use the logo as a loading indicator

![logo-sweep](/uploads/ff048fd2e56a6dcae8801f998b484623/logo-sweep.gif)

See merge request !2277
 2016-01-05 09:30:09 +00:00
Robert Speicher 7df3c1e8ea Correct the logo ID names 
Her left, not ours!
 2016-01-04 14:54:56 -05:00
Stan Hu 2802d4992d Expire view caches when application settings change 
Closes #5728
 2016-01-03 11:20:14 -08:00
Robert Speicher c80f75ea1f Give the logo shapes meaningful IDs 2016-01-02 15:29:55 -05:00
Zeger-Jan van de WegandRobert Speicher 1be406d741 Swap Author and Assignee Selectors on issuable index view 
Closes #4039
 2015-12-30 18:21:53 -05:00
Dmitriy Zaporozhets aa712e2b36 Merge branch 'new-project-header-redesign' into 'master' 
Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now

Fixes #2876 and #3482
Used existing styles. <br/>
Did not attempt to make pixel perfect as styles already exist. <br/>

![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png)

See merge request !2156
 2015-12-24 14:17:11 +00:00
Jacob Schatz 7ba4482fcf fixes failing test by updating project clone instructions 2015-12-23 19:57:30 -05:00
Jacob Schatz 8bbcbe7854 spacing changed from 4 to 2 in _clone_panel.html.haml. 2015-12-23 12:43:27 -05:00
Jacob SchatzandJacob Schatz ea5fa54b2d dropdown chooses right default 2015-12-23 12:26:50 -05:00
Jacob SchatzandJacob Schatz f56783e524 adds dropdown for cloning 2015-12-23 12:26:50 -05:00
Douwe Maan d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Dmitriy Zaporozhets 3321f694b8 Merge branch 'fix-milestone-snippet-header' into 'master' 
Fix headers of milestone and snippet show pages

Fix layout, and move "Edit" button to very right just like issue/MR.

Before:

![Screen_Shot_2015-12-15_at_17.33.20](/uploads/dbbeb6868b80e21894159126a0feca6a/Screen_Shot_2015-12-15_at_17.33.20.png)

![Screen_Shot_2015-12-15_at_17.33.28](/uploads/53d10b42adc34e48b063889120e9a746/Screen_Shot_2015-12-15_at_17.33.28.png)

After:

![Screen_Shot_2015-12-15_at_17.34.25](/uploads/b0d0ea3f6a7b61d51b474419207f7a02/Screen_Shot_2015-12-15_at_17.34.25.png)

![Screen_Shot_2015-12-15_at_17.35.55](/uploads/65b922f5249655d3733740690577c9d7/Screen_Shot_2015-12-15_at_17.35.55.png)

cc @skyruler 

cc @rspeicher 8.3 please!

See merge request !2104
 2015-12-16 17:59:28 +00:00
Douwe Maan ff16ee63e6 Revert "Fix "Notifications" label color" 
This reverts commit e4e1777aa5.
 2015-12-16 16:23:31 +01:00
Douwe Maan f4c94e1fd6 Revert "Use regularly colored button for "Subscribe"/"Unsubscribe"" 
This reverts commit c1db8d1590.
 2015-12-16 16:23:18 +01:00
Douwe Maan 79c90821ac Rename .issuable-details to .detail-page (and -header and -description) 2015-12-16 16:13:22 +01:00
Douwe Maan c1db8d1590 Use regularly colored button for "Subscribe"/"Unsubscribe" 2015-12-15 17:33:03 +01:00
Douwe Maan e4e1777aa5 Fix "Notifications" label color 2015-12-15 17:32:46 +01:00
Douwe Maan 297398ea32 Move cross-project reference down 2015-12-15 17:32:37 +01:00
Douwe Maan 5413960b1a Fix headers of milestone and snippet show pages 2015-12-15 17:29:37 +01:00
Kamil Trzciński e81ae1e68c Merge branch 'ci-services-migrate' into 'master' 
Ci Services migrate



See merge request !1985
 2015-12-14 10:32:57 +00:00
Dmitriy Zaporozhets b4ea6ad16a Few UI improvements to new sidebar implementation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets 617ba01322 Fix tests for new issuable sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets b0591ff03a Redesign issue page for new sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets f7bba47f8a Implement issuable sidebar partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:09:04 +01:00
Kamil Trzcinski 2988e1fbf5 Migrate CI::Services and CI::WebHooks to Services and WebHooks 2015-12-10 16:04:08 +01:00
Douwe Maan 4e5897f51e Merge branch 'tmp-reference-pipeline-and-caching' into 'master' 
[Second try] Implement different Markdown rendering pipelines and cache Markdown

!1602 already got merged in bcd89a58e7, but it would appear the merge commit disappeared because of #3816 (or some other reason).

cc @rspeicher 

See merge request !2051
 2015-12-10 14:34:12 +00:00
Douwe Maan 10387f6b8a Merge branch 'master' into tmp-reference-pipeline-and-caching 
# Conflicts:
#	spec/lib/gitlab/markdown/autolink_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/cross_project_reference_spec.rb
#	spec/lib/gitlab/markdown/emoji_filter_spec.rb
#	spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/external_link_filter_spec.rb
#	spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/label_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/redactor_filter_spec.rb
#	spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
#	spec/lib/gitlab/markdown/relative_link_filter_spec.rb
#	spec/lib/gitlab/markdown/sanitization_filter_spec.rb
#	spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
#	spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
#	spec/lib/gitlab/markdown/task_list_filter_spec.rb
#	spec/lib/gitlab/markdown/upload_link_filter_spec.rb
#	spec/lib/gitlab/markdown/user_reference_filter_spec.rb
 2015-12-10 14:04:34 +01:00
Robert Speicher cbac31d923 Add copy-to-clipboard button to Snippets#show 
Closes #3701
 2015-12-09 14:54:54 -05:00
Zeger-Jan van de WegandStan Hu 56f25c3e61 Improve text indication visibility on snippets 2015-12-08 14:31:24 -08:00
Robert Speicher e6668f8e34 Merge branch 'edit-in-patch-branch' into 'master' 
Default target branch to patch-n when editing file in protected branch

Fixes #3441

See merge request !2021
 2015-12-08 22:04:52 +00:00
Robert Speicher bcd89a58e7 Merge branch 'reference-pipeline-and-caching' into 'master' 
Implement different Markdown rendering pipelines and cache Markdown

Builds on !1090. 

Related to !1014.

Fixes #2054.

See merge request !1602
 2015-12-08 20:22:23 +00:00
Dmitriy Zaporozhets 7234610010 Merge remote-tracking branch 'origin/ui/misc' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-08 18:50:02 +01:00
Dmitriy Zaporozhets 54d0ff982b Merge branch 'build-related-fixes' into 'master' 
Build related UI fixes

## Before

![Screen_Shot_2015-12-08_at_13.15.21](/uploads/b72ed55da1f0ec953d2eb077fa4fbb18/Screen_Shot_2015-12-08_at_13.15.21.png)

## After

![Screen_Shot_2015-12-08_at_13.15.01](/uploads/144d8099e2724a51125e392dcbd43ed4/Screen_Shot_2015-12-08_at_13.15.01.png)


See merge request !2015
 2015-12-08 17:06:11 +00:00
Douwe Maan df6750d3d6 Default target branch to patch-n when editing file in protected branch 2015-12-08 16:42:10 +01:00
Douwe Maan 1b5302f8e7 Reduce MR/issue duplication 2015-12-08 13:06:54 +01:00
Douwe Maan 6fb90a2ca3 Include groups in dashboard "New Milestone" select. 2015-12-07 17:24:15 +01:00
Douwe Maan 5a9a8d03a7 Merge branch 'master' into ui/dashboard-new-issue 2015-12-07 17:12:29 +01:00
Douwe Maan cbcb8dbe70 Use select2 dropdown for dashboard/group 'New X' buttons 2015-12-07 17:12:04 +01:00
Douwe Maan d611a38798 Merge branch 'master' into reference-pipeline-and-caching 2015-12-07 14:48:53 +01:00
Douwe Maan dddfbb653e Merge branch 'master' into ui/misc 2015-12-07 13:48:18 +01:00
Douwe Maan 0bca65b283 Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-date 2015-12-07 12:03:34 +01:00
Andrew Tomaka 1c53dc28b5 Notify user if they cannot create projects 2015-12-05 11:32:08 -05:00
Stan Hu 253301bb47 Make current user the first user in assignee dropdown in issues detail page 
Closes #3679
 2015-12-04 07:14:04 -08:00
Dmitriy Zaporozhets 238ca3e472 Merge remote-tracking branch 'origin/ui/issuable-form' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 15:12:03 +01:00