root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
44,776 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

71 Commits

Author SHA1 Message Date
Robert Speicher 2fe13fbc4b Use `:empty_project` where possible in helper specs 2017-01-25 17:10:32 -05:00
Jacob Vosmaer 6731ab5d76 Add Gitlab::Middleware::Multipart 2016-12-15 12:26:36 +01:00
Lin Jen-Shin 9c4e0d6445 Use `Gitlab.config.gitlab.host` over `'localhost'` 
This would fix long standing failures running tests on
my development machine, which set `Gitlab.config.gitlab.host`
to another host because it's not my local computer. Now I
finally cannot withstand it and decided to fix them once and
for all.
 2016-11-18 20:17:10 +08:00
Clement Ho fa1ac47ef1 Replace jQuery.timeago with timeago.js 2016-11-07 14:49:00 -06:00
tiagonbotelho 519275c110 fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
Annabel Dunstone 9955dc29a8 Update timeago to shorter representation 2016-08-04 15:01:37 -05:00
Phil Hughes 68c9981013 Correctly adds commit ID into dropdown 
Removes un-used method
Fixes other Ruby issues
 2016-06-18 21:49:20 +01: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
Robert Speicher 93e6282657 Add `:with_avatar` trait to User factory 2016-02-24 13:50:03 -05:00
Ben Boeckel 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
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 456ddb5eb7 Fix time_ago_with_tooltip for activity feed 
Closes #4002
 2015-12-11 13:57:49 -05:00
Robert Speicher a1d3b8d7fa Fix spec failure introduced by 9d03bc6fa3 2015-12-07 16:50:20 -05:00
Valery Sizov e0131c5d07 Merge branch 'rails_update_to_4_2' into 'master' 
Rails update to 4.2.4

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

See merge request !1902
 2015-11-30 16:49:09 +00:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Jan-Gerd Tenberge b5c19bcc4d Fix merge error 2015-10-22 21:43:17 +02:00
Jan-Gerd Tenberge b32bb37799 Merge remote-tracking branch 'origin/master' into gravatar-retina 2015-10-22 21:37:44 +02:00
Jan-Gerd Tenberge 34d0cd438a Update spec 2015-10-19 01:22:20 +02:00
Jan-Gerd Tenberge 7d7b6dbb9f Update spec 2015-10-19 01:21:21 +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
Jan-Gerd Tenberge 3ef71fa4fb Add support for HiDPI displays in gravatar service 2015-09-26 20:53:16 +02:00
Robert Speicher 42b643f057 Fix ApplicationHelper specs 
There were several specs that were failing when run by themselves.

- Use the `helper` object, as per RSpec 3 standards
- Use `assign` to assign instance variables that helpers expect
- Add `StubConfiguration` support module
 2015-06-30 17:47:53 -04:00
Stan Hu fe94254571 Fix avatar tests to use banana_sample.gif since SVG is not supported 2015-06-22 12:04:07 -07:00
Dmitriy Zaporozhets 595b3323a8 Merge branch 'rs-rspec3' into 'master' 
RSpec3

Upgrades rspec to 3.3.0, we're now up-to-date! 🎉

See merge request !831
 2015-06-22 13:15:27 +00: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
Robert Speicher 5a9ede4721 Update mock and stub syntax for specs 2015-06-22 12:13:46 +02:00
Robert Speicher ff27747ec7 Fix timezone-based time_ago_with_tooltip spec failures 2015-06-19 16:49:52 -04: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
Robert Speicher 8c8cd8be43 Update time_ago_with_tooltip helper 
Minor refactoring, add specs, changes arguments to use keywords.
 2015-06-17 16:37:10 -04:00
Robert Speicher 8112f7550b Add PreferencesHelper module 
Consolidates the helpers related to user preferences.

Renames `app_theme` to `user_application_theme` to better explain what
it is.
 2015-06-13 17:58:16 -04:00
Jakub Jirutka b0659c1b07 Simplify and unify helpers for rendering markup 2015-05-18 22:52:13 +02:00
Jakub Jirutka 8dbc4746fe Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) 2015-05-18 20:48:03 +02:00
Robert Speicher c917b26f41 Recover from all `URI::Error`s 
Fixes #2257
Fixes #2260
 2015-04-21 22:02:44 -04:00
Robert Speicher 975f1e6ec8 Speed up the overridden `link_to` helper 
Only bothers to check the provided link's external status if it's a
String that doesn't begin with a path or anchor character.
 2015-04-12 17:48:28 -04:00
Dmitriy Zaporozhets bf0c04e5ff Fix specs 2015-03-12 14:51:41 -07:00
Jeroen van Baarsen 93bacb03e5 Merge pull request #8890 from sue445/feature/project_api_avatar_url 
Expose avatar_url in projects API
 2015-03-01 10:54:42 +01:00
sue445 51abeaa1bc Expose avatar_url in projects API 
* Impl Project#avatar_url
* Refactor ApplicationHelper: Use Project#avatar_url
* Update changelog
 2015-03-01 10:13:01 +09:00
Robert Schilling 1c7947ace0 Add UTF-8 character to version_sorter test 2015-02-25 21:40:27 +01:00
Robert Schilling c6e9d14ceb Update version sorter to 2.0.0, fixes #8572 2015-02-24 23:20:00 +01:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Jeroen van Baarsen 026e988544 Even more hound fixes 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 21:00:55 +01:00
Jeroen van Baarsen 0c4a70a306 Updated rspec to rspec 3.x syntax 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 19:17:35 +01:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Steven Thonus 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Hannes Rosenögger 6bf58e76bd Remove unnecessary / from avatar url 
So http://localhost:3000//uploads/user/avatar/1/avatar.png
becomes http://localhost:3000/uploads/user/avatar/1/avatar.png
 2015-01-19 14:08:06 +01:00
Dmitriy Zaporozhets 939c046a98 Fix feature and tests 2015-01-08 13:21:00 -08:00
Marin Jankovski 3f1fad5f09 Add an avatar_url spec when relative url is set. 2014-12-05 15:59:55 +01:00
Robert Schilling 8265d43d01 Force of markup output to be the input encoding 2014-08-11 12:18:07 +02:00
Dmitriy Zaporozhets fe228b89d5
Fix application helper specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-07 20:12:02 +03:00