home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,414 Commits 48 Branches 340 Tags
ca823065a905f8c19b2003a67e79831ba1ceff2e
Commit Graph
362 Commits
Author SHA1 Message Date
Elias Werberich c3a98d8fcc Implementing 'Groups View' and 'TODOs View' as options for dashboard preferences. 
Fixes #14585.
 2016-03-24 19:59:54 +01:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01:00
Douwe Maan 45e8650c4f Fix specs 2016-03-20 23:26:58 +01:00
Arinde Eniola 367818d293 change the css class has_tooltip to has-tooltip universally 2016-03-20 21:37:22 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Douwe Maan 2eb19ea3ea Merge branch 'master' into issue_12658 2016-03-20 14:57:25 +01:00
Stan Hu 68fa4de6e3 Make HTTP(s) label consistent on clone bar 
Sites that use http:// for the external_url should always display HTTP on
the clone bar. Similarly, sites that use https:// should show HTTPS.
 2016-03-19 22:47:27 -07:00
Zeger-Jan van de WegandFelipe Artur b959ae553b Improve group visibility level feature 2016-03-18 16:58:04 -03:00
Rémy Coutable 9d15814eb0 Fix specs 2016-03-18 20:26:30 +01:00
Felipe Artur 44c127447b Merge 4009-external-users into issue_12658 2016-03-16 20:16:42 -03:00
Rémy Coutable 1714883107 Revert "Merge branch 'avatar-cropping' into 'master' " 
This reverts commit 01160fc061, reversing
changes made to 4bff9daf8b.
 2016-03-15 14:55:40 +01:00
Felipe Artur f2a9ee258e Add permission level to groups 2016-03-10 10:38:36 -03:00
Robert Speicher b900304c38 Make better use of the visibility_level factory traits 2016-03-08 16:40:45 -05:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Robert Speicher 93e6282657 Add :with_avatar trait to User factory 2016-02-24 13:50:03 -05:00
Douwe Maan ad12f11f3e Merge branch 'rs-emoji' into 'master' 
Update Gemojione for new hotness ✨

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800
 2016-02-19 08:11:02 +00:00
Robert Speicher f993130b13 Fix specs expecting emoji/ in image path 2016-02-13 14:03:07 -05:00
Ben BoeckelandRémy Coutable e919b5a4e9 Fix relative links in other markup formats 
- Apply the RelativeLinkFilter filter to other formats, e.g.,
  reStructuredText so links from the Files view or the Project view work
- Remove the AsciidocPipeline pipeline

Fixes #3533.
 2016-02-12 17:20:59 +01:00
Rémy Coutable 6e79ce2efd Allow link_to_label to take an optional type arg 
You can set type: :merge_request to create a link to merge request
lists instead of issues list. Accept both Symbol & String as type
argument for the link_to_label helper
 2016-02-04 19:14:48 +01:00
Dmitriy Zaporozhets 9f86fcde40 Fix broken tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-04 17:00:32 +01:00
Douwe Maan fa0cbb1399 Fix specs and add a new one 2016-01-30 12:53:12 +01:00
Robert Speicher 2e911721d2 Update text_color_for_bg helper to support RGB triplet color codes 
Closes #12677
 2016-01-24 15:06:46 -08:00
Douwe Maan 701513dcc7 Move parallel diff logic to separate class 2016-01-20 14:53:20 +01:00
Douwe Maan 512bebe21d Refactor Gitlab::Highlight and fix tests 2016-01-19 14:52:41 +01:00
Rubén Dávila c8db25c37c Merge branch 'master' into issue_3945 2016-01-14 17:28:44 -05:00
Rubén Dávila 6b9c730e91 More refactoring from last code review. #3945 
* Use commit objects instead of IDs when generating diffs
* Use proper references when generating MR's source and target
* Update broken specs
 2016-01-14 16:47:55 -05:00
Douglas Barbosa Alexandre 4872b319c8 Use the WikiPipeline when rendering the wiki markdown content 2016-01-14 12:09:31 -02:00
Robert Speicher 843662821d Move BroadcastMessage#status to a helper since it's presentational 2016-01-13 11:49:59 -05:00
Robert Speicher 5a1706791e Update broadcast_message helper 
Now it returns the fully-formatted message so we can be consistent about
how it's shown.
 2016-01-13 11:34:58 -05:00
Robert Speicher 100cdce21e Make sure time_ago_with_tooltip is using a Time object 
Somehow this test existed on EE but not in CE, so it started failing
after a bad CE-to-EE merge.
 2016-01-12 13:13:16 -05:00
Rubén Dávila 164c6374a7 Fix broken specs. #3945 2016-01-08 19:57:51 -05:00
Rubén Dávila 78d7c0e0d8 Fix broken specs. #3945 2016-01-08 19:05:55 -05:00
Robert Speicher fa36749bce Add two custom Date/Time conversion formats 2016-01-07 20:01:08 -05:00
Douwe Maan 384445eca6 Don't override issue page description in project layout. 2016-01-06 13:02:51 +01:00
Robert Speicher 43053c2e6f Make page_description less magical ✨ 2016-01-05 14:54:59 -05:00
Robert Speicher a298f69432 Use User#avatar_url instead of avatar_icon helper 2016-01-05 14:50:52 -05:00
Douwe Maan 7a3b762978 Merge branch 'master' into more-opengraph 
# Conflicts:
#	app/views/layouts/_head.html.haml
 2016-01-05 16:35:18 +01:00
Valery Sizov 8b18449125 remove public field from namespace and refactoring 2016-01-04 16:00:29 +02:00
Rubén Dávila 7de90f4b53 Fix broken spec and small refactor. #3945 2015-12-30 18:42:11 -05:00
Rubén Dávila bb96d63153 New implementation for highlighting diff files. #3945 
* It is more performant given now we process all the diff file instead
  of processing line by line.
* Multiline comments are highlighted correctly.
 2015-12-30 00:52:50 -05:00
Rubén DávilaandRubén Dávila 34657b821a Add syntax highlighting to diff view. #3945 2015-12-28 18:31:27 -05:00
Robert Speicher dcca64a523 Use assign instead of instance_variable_set 2015-12-27 19:58:44 -05:00
Robert Speicher a7756a4b51 Add specs for page_image using a Group's avatar 2015-12-27 19:49:48 -05:00
Dmitriy Zaporozhets fd231ff9fb Merge branch 'revert_votes_back' into 'master' 
Revert vote buttons back to issue and MR pages

https://gitlab.com/gitlab-org/gitlab-ce/issues/3672



/cc @dzaporozhets @JobV 


![joxi_screenshot_1450809309400](/uploads/379a75505e0d5f24e743aa0a6a6684e2/joxi_screenshot_1450809309400.png)


See merge request !2206
 2015-12-25 15:52:06 +00:00
Valery Sizov c79ffa01b4 satisfy rubocop 2015-12-25 15:46:01 +02:00
Valery Sizov 195dc3a746 add sorting of awards 2015-12-25 14:11:19 +02:00
Robert Speicher ab3d855c0e Add support for twitter:label meta tags 2015-12-24 17:11:08 -05:00
Robert Speicher c6d2508362 Truncate page_description to 30 words 2015-12-24 16:26:52 -05:00
Robert Speicher 5a3b9c97e3 Account for @project.description being nil 2015-12-23 17:14:18 -05:00
Robert Speicher b26eb782f5 Add page descriptions and images 
A limited number of pages have defined their own descriptions, but
otherwise we default to the Project's description (if `@project` is
set), or the old `brand_title` fallback.

The image will either be the uploaded project icon (never a generated
one), the user's uploaded icon or Gravatar, or, finally, the GitLab
logo.
 2015-12-23 16:56:27 -05:00