home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
266 Commits
Author SHA1 Message Date
Alfredo Sumaran c11c574d3e Convert time param to Time 2016-04-07 00:00:58 -05:00
Douglas Barbosa Alexandre 1029f4101b Fix issues count on project view 2016-03-17 20:55:59 -03:00
Robert Speicher dc396d0fa4 Merge branch 'edited-text' into 'master' 
Edited timeago text on comments

Unified the 'edited text' to be the same in descriptions and comments

Closes #5538 

See merge request !3063
 2016-03-17 20:35:06 +00:00
Phil Hughes 2941a76fe0 Added skip_js comment 
[ci skip]
 2016-03-16 08:51:09 +00:00
Douwe Maan 2b9b07891c Merge branch 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-lookup' 
# Conflicts:
#	app/helpers/application_helper.rb
 2016-03-12 13:12:40 +01:00
Phil Hughes c7730121c1 Fixed failing rubocop test 2016-03-10 08:39:47 +00:00
Phil Hughes cd1d045fe2 Fixed issue with timeago not firing 2016-03-10 08:39:47 +00:00
Phil Hughes 12506abfe7 Single if statement 2016-03-10 08:39:47 +00:00
Phil Hughes 538f3e0d71 Fixed ruby issues from feedback 
Fixed failing tests
 2016-03-10 08:39:47 +00:00
Phil Hughes 3d99ffc862 Edited timeago text on comments 
Unified the 'edited text' to be the same in descriptions and comments

Closes #5538
 2016-03-10 08:39:47 +00:00
Douglas Barbosa Alexandre 7500a12aae Avoid error 500 when todo author was removed 2016-03-09 14:47:04 -03:00
nico de ceulaer 3447ffbe9a ensure also alternative email addresses are used when looking up user 2016-03-03 14:50:21 +01: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
Rémy Coutable 54613b6af5 Fix the "x of y" displayed at the top of Issuables' sidebar 
1. We now display the index of the current issuable among all its project's
issuables, of the same type and with the same state.
2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper
module.
3. Added acceptance specs for the sidebar counter.
 2016-02-15 15:40:24 +01:00
Robert Speicher 65c81466c4 Remove unused emoji_autocomplete_source helper 2016-02-12 15:22:47 -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
Dmitriy Zaporozhets 42e0e35784 Merge branch 'search-on-groups-is-ugly' into 'master' 
Change placeholder text to just 'search'

Fixes #13168 

![Screen_Shot_2016-02-04_at_12.30.16_PM](/uploads/ca3c5549abeedce99d693606135d7428/Screen_Shot_2016-02-04_at_12.30.16_PM.png)


See merge request !2711
 2016-02-04 20:09:29 +00:00
Jacob Schatz b1757c200c Change placeholder text to just 'search' 2016-02-04 12:29:32 -05:00
Jacob Schatz 2e6c5fb28e Properly link to the right issue or merge request 2016-02-04 11:10:11 -05:00
Jacob Schatz 9c2bd8b70e Sidebar collapse and expand work with whole page. 2016-01-28 18:26:47 -05:00
Jacob Schatz f64e35069e Add js to expand and contract side menu 2016-01-27 23:47:37 -05:00
Jacob Schatz 087abdf7fd New right side gutter design. 
[WIP]
 2016-01-27 17:38:19 -05:00
Jacob Schatz d3f24a2221 Adds base64 background search icon. 
All inputs of type `search` will have the gray background
and search icon centered.
Because the search magnifier is a bg image,
I had to hide it with `[value=""]`.
I added a little javascript to make sure each input always has it's
own value.
 2016-01-24 20:20:03 -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
Douwe Maan bbc28428a6 Merge branch 'maintain-milestone-filter' into 'master' 
enable milestone filter to stick



See merge request !2241
 2016-01-13 13:32:20 +00:00
Greg Smethells c73d55e1be enable milestone filter to stick 2016-01-12 13:18:05 -06: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
Robert Speicher fa36749bce Add two custom Date/Time conversion formats 2016-01-07 20:01:08 -05:00
Robert Speicher 59305715e9 Remove stamp gem 
Closes #5908
 2016-01-07 16:28:33 -05:00
Stefan KahlhöferandRubén Dávila 41c74cec09 Downcased user or email search for avatar_icon. 
Signed-off-by: Rubén Dávila <rdavila84@gmail.com>
 2015-12-28 18:13:50 -05:00
Dmitriy Zaporozhets a9d19fa8ef Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 14:24:32 +01:00
Gabriel Mazetto b5291f9599 Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
Robert Speicher 456ddb5eb7 Fix time_ago_with_tooltip for activity feed 
Closes #4002
 2015-12-11 13:57:49 -05:00
Phillip Berndt 86ed2e43d5 time_ago_with_tooltip javascript snippet: Don't reinitialize older elements 
see bug #3758
 2015-12-03 16:04:39 +01:00
Jan-Gerd Tenberge 3b717c8a8c Fix typo 2015-11-01 02:42:36 +01:00
Jan-Gerd Tenberge c5146ca151 Fix merge error 2015-10-23 03:00:08 +02:00
Jan-Gerd Tenberge b5c19bcc4d Fix merge error 2015-10-22 21:43:17 +02:00
Yorick Peterse 693e63f523 Allow avatar_icon to operate on a User 
If the User object is already known before calling this method being
able to re-use said object can save us an extra SQL query.
 2015-10-15 12:05:01 +02:00
Dmitriy Zaporozhets 04c7dc2a9e Cleanup CI code after refactoring and fix several 500 errors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 20:15:06 +02:00
Guilherme Garnier 2b075f16c7 Fix rubocop warnings in app 2015-10-03 00:56:37 -05:00
Jan-Gerd Tenberge 8d620e39c9 Add scale argument in user class 2015-09-26 21:51:02 +02:00
Jan-Gerd Tenberge f93177c6a3 Add scale parameter to helper 2015-09-26 21:25:04 +02:00
Kamil Trzcinski e7bca1c853 Check current_controller against controller_path 
The controller_path includes namespaces, where controller_name only includes the class name without controller
 2015-09-17 14:22:43 +02:00
Stan Hu 71cdb24990 Fix default avatars to ensure that helpers don't have /assets dir appended 2015-09-16 10:52:23 -07:00
Drew Blessing 539f30ddcf Fix tooltip display in list views 2015-09-14 08:45:16 -05:00
Dmitriy Zaporozhets 1bf3e1578a Properly render plain readme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 11:36:09 +02:00
Dmitriy Zaporozhets cc9b5c49d1 Merge branch 'revert-mr-state-names' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/merge_requests.rb
 2015-06-22 15:43:09 +02:00
Dmitriy Zaporozhets 6c4d48b8b9 Merge branch 'rs-remove-link-to-override' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/helpers/application_helper_spec.rb
 2015-06-22 12:26:41 +02:00
Dmitriy Zaporozhets 7524d7c082 Revert merge request states renaming 
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 17:09:50 +02:00
Robert Speicher 54365ecc7a Remove overridden link_to helper 
The purpose for this override is now handled by `ExternalLinkFilter`.
 2015-06-17 17:23:16 -04:00