Commit Graph

409 Commits

Author SHA1 Message Date
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 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
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öfer 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
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
Robert Speicher 844d72716e Add Gitlab::Themes module; remove Gitlab::Theme
Now we can simply loop through all themes, among other things.

This also removes the `dark_theme` / `light_theme` classes and the
`theme_type` helper, since they weren't used anywhere.
2015-06-13 17:58:16 -04:00
Robert Speicher 1a52f19c45 Remove now-unused `escaped_autolink` helper and rails_autolink gem 2015-06-02 13:04:10 -04:00
Douwe Maan d25026a512 Add Accepted and Rejected tabs to MR lists. 2015-05-25 17:01:27 +02:00
Jakub Jirutka b0659c1b07 Simplify and unify helpers for rendering markup 2015-05-18 22:52:13 +02:00
Jakub Jirutka daa0925016 Rename MarkdownHelper to MarkupHelper 2015-05-18 22:51:56 +02:00
Jakub Jirutka 8dbc4746fe Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) 2015-05-18 20:48:03 +02:00
Dmitriy Zaporozhets ded82ed4c9 Small refactoring of state_filters_text_for helper 2015-05-14 18:34:06 +03:00
Dmitriy Zaporozhets 40f381e652 append empty space only if count exists 2015-05-14 18:32:07 +03:00
Dmitriy Zaporozhets 3d4d89f060 Use count badges with number_with_delimiter helper for issue, commit count 2015-05-14 18:30:23 +03:00
Hannes Rosenögger 2a3c1d7cdd Fix commit time being displayed in the wrong timezone in some cases 2015-05-07 18:18:23 +02:00
Marin Jankovski 219cbf3927 Check if project before calling count on issuable. 2015-04-24 13:53:22 +02:00
Marin Jankovski 6977810360 Add issue and merge request count for state filters. 2015-04-24 13:53:21 +02:00
Dmitriy Zaporozhets 71f6143552
Merge branch 'master' into new-sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/snippets_controller.rb
2015-04-23 12:08:03 +03:00
Dmitriy Zaporozhets 4860c4dc07
Fix toggle of sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-22 16:48:39 +03:00
Robert Speicher c917b26f41 Recover from all `URI::Error`s
Fixes #2257
Fixes #2260
2015-04-21 22:02:44 -04:00
Robert Speicher cd590bf1f4 Use `start_with?` instead of String slicing to check for external links
[ci skip]
2015-04-12 18:04:50 -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
Douwe Maan 0ece6bd828 Use `\A` and `\z` in regexes instead of `^` and `$`. 2015-04-10 18:31:07 +02:00
Dmitriy Zaporozhets d6c8eefb5d Big refactoring of issues filters
* Squash project users selectbox and users selectbox into one class
* Move from API autocomplete to GitLab internal one
* Smarter filter for project/group/all issues
* Use selectbox with searchbox for assignee/author/milestone/label
* Switch to ajax filter for issue author/assignee
2015-03-26 19:13:49 -07:00
Dmitriy Zaporozhets 777c119fd2 Restyle oauth accounts at profile page and add ability to unlink account 2015-03-21 17:46:00 -07:00
Dmitriy Zaporozhets 7ac62388a5 Prevent database query each time we render group avatar 2015-03-12 13:56:53 -07: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
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets a8a328b151 DB performance improvements to GitLab 2015-02-18 00:16:42 -08: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
Dmitriy Zaporozhets 254a63dcf7 Improve collapsing sidebar 2015-02-03 13:11:33 -08:00
Dmitriy Zaporozhets 61cc6a9244 Rubocop: indentation fixes Yay!!! 2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets cc39bca3fa Rubocop: Style/AlignHash enabled 2015-02-02 21:15:44 -08:00
Robert Speicher fe831dcd6f Move `spinner` helper into IconsHelper
Also updates it to use the new `icon` method.
2015-01-28 03:37:44 -05:00
Dmitriy Zaporozhets 3588a07b83 Remove default project icon 2015-01-24 23:08:52 -08:00
Dmitriy Zaporozhets b92449c73e Predefine colors for project identicons 2015-01-24 22:03:30 -08: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
Dmitriy Zaporozhets 41d7be3ce1 Allow to specify home page for non logged-in users 2015-01-16 16:01:15 -08:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
2015-01-15 13:41:11 +01:00
Dmitriy Zaporozhets d02a22ba21 Redesign signin/singup pages 2015-01-07 17:07:36 -08:00
Marin Jankovski 607ea7c6e5 Share the key table between admin and profile resources. 2014-12-30 11:01:30 +01:00
Francesco Coda Zabetta 84b40a346a check browser version, blacklisting outdated IE (version < 10) 2014-12-24 16:22:08 +01:00
Dmitriy Zaporozhets 47634e392f
Refactor issues and merge requests lists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-23 18:49:39 +02:00
Drew Blessing f06f69b9da Add theme type css class 2014-12-15 13:21:26 -06:00
Ciro Santilli 7dcbf35019 Replace www.gitlab.com with about.gitlab.com 2014-10-07 13:16:19 +02:00
Dmitriy Zaporozhets 299114948b
Use only escaped auto_link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-06 15:15:39 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Robert Schilling 390183a426 Factor out Emoji parsing using html-pipeline-gitlab 2014-09-26 01:32:33 +02:00
uran 02eca79ef1 Changed activity notes to display first MEANINGFUL line. 2014-09-12 14:22:15 +03:00
Charles Bushong 858dbd0842 Updating to persist a params snippets variable 2014-09-05 13:30:55 -04:00
Charles Bushong 4cca1b050a Adding in snippet search functionality
http://feedback.gitlab.com/forums/176466-general/suggestions/5529795-search-though-snippets
2014-08-29 15:32:07 -04:00
Robert Schilling 8265d43d01 Force of markup output to be the input encoding 2014-08-11 12:18:07 +02:00
Robert Schilling d7701a263f Move calls to Gitlab::MarkdownHelper to application_helper 2014-08-11 11:59:36 +02:00
Robert Schilling 2fd30cc57f Rescue if markup fails, fixes #7455 2014-08-10 13:25:35 +02:00
Dmitriy Zaporozhets ae564c97d4
Dont expose user email via API
To prevent leaking of users info we reduce amount of user information
retrieved via API for normal users.

What user can get via API:

* if not admin: only id, state, name, username and avatar_url
* if admin: all user information
* about himself: all informaion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 17:46:48 +03:00
Dmitriy Zaporozhets afa4a075e4
Show spinner on network graph while it loading
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-11 22:22:58 +03:00
Marvin Frick 587502390b fixes gitlab.com issue #229
Changes .js.coffe files to not use a hardcoded path to
`no_avatar.png` but instead stick with the asset pipeline.

renames coffee.erb back to coffee
2014-06-10 22:28:11 +02:00
Marin Jankovski 4a03bbe483 Add nofollow to all internal links. 2014-05-30 17:09:31 +02:00
Marin Jankovski 3910b5917c Extend default link_to helper to add noreferrer html_option. 2014-05-29 12:49:15 +02:00
Arnaud ABELARD 5d7bdf7642 allow using the user's email address as a http parameter in gravatar urls for custom avatar systems. For example:
plain_url: "http://avatar.company.com/avatar/?mail=%{email}&size=%{size}"

add mention of the different placeholders possible for gravatar urls, mentionning the new %{email}
2014-04-12 23:10:45 +02:00
Dmitriy Zaporozhets 1c23f2b259
Correct image path to social icons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12 10:08:58 +02:00
Robert Speicher efd860d1da Remove extra whitespace 2014-03-10 03:44:49 -04:00
Robert Speicher 74d2085cdf Sort tag names using VersionSorter 2014-03-09 00:01:06 -05:00
Robert Speicher a37c679400 Remove arguments from grouped_options_refs
Must have been left over from a previous revision, but the argument
wasn't used anywhere in the method.
2014-03-09 00:01:06 -05:00
Dmitriy Zaporozhets 261f212b3b
Use rails helper image-url for reference images in css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-06 11:05:00 +02:00
Dmitriy Zaporozhets f0f88390c1
project_user selectbox with ajax autocomplete
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-13 16:08:26 +02:00
Dmitriy Zaporozhets 268c183b29
Replace gif animation with font icon spinner
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 20:30:57 +02:00
Dmitriy Zaporozhets a184fcf368 Merge pull request #6178 from Popl7/add_group_avatars
added group avatars
2014-01-28 00:26:18 -08:00
Steven Thonus 251df827a5 added group avatars 2014-01-28 08:38:00 +01:00
Dmitriy Zaporozhets 78b2fb5de9
Add highlight.js support to markdown, snippets etc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 13:12:58 +02:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets d6c037de81
Dont render README with markup if format is not compatible
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-08 16:32:03 +02:00
Dmitriy Zaporozhets 9a7e2399dd
Use jquery timeago plugin
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-30 14:38:42 +02:00
Dmitriy Zaporozhets cf31f289d7
Move project_last_activity to ProjectsHelper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-29 13:55:45 +02:00
Jeroen van Baarsen a9d1038f03 Fixed the no_avatar.png path
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4394
2013-12-16 21:56:45 +01:00
Drew Blessing fa817dffea Add time ago tooltips to show actual date/time
Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Add helper method

change to use app helper

Modify tooltips to use new helper

Convert remaining times

Adjust one tooltip
2013-12-14 15:24:12 -06:00
Dmitriy Zaporozhets cf5d3bb0ad Improve help page for Project web hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:18 +02:00
Dmitriy Zaporozhets b07c02eb13
Add more info to admin dashboard
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 13:41:41 +02:00
Dmitriy Zaporozhets 467e4e81f4
Dont show last push widget if user removed this branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 14:17:03 +02:00
Dmitriy Zaporozhets d89c6adfe6
Improve select UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 22:32:28 +02:00
Dmitriy Zaporozhets c5b667351a
Show broadcast message to users
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 15:08:20 +02:00
Robert Speicher cb9cf077de Refactor and cover search_autocomplete_source 2013-10-20 01:05:20 -04:00
Robert Speicher bb494203d2 Cover the simple_sanitize helper 2013-10-19 23:57:34 -04:00
Sytse Sijbrandij b0502c20a9 Consistent naming to make difference between clicking on profile pic and profile settings clear. 2013-10-10 10:43:24 +02:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Dmitriy Zaporozhets 66998f6d46 Allow non authenticated user access to public projects 2013-09-24 15:58:39 +03:00
Dmitriy Zaporozhets 13fec18ac9 Truncate some text from dashboard events 2013-09-11 22:46:37 +03:00
Dmitriy Zaporozhets fb36355f2f Different search placeholder depdends on area 2013-08-10 19:12:25 +03:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Dmitriy Zaporozhets 467e7c10b5 Add more autocomplete options to project search 2013-06-26 19:25:07 +03:00
Dmitriy Zaporozhets 3e09e6f7b8 Move Profile related controllers under Profiles:: module 2013-06-24 18:24:14 +03:00
Dmitriy Zaporozhets 439f399bec Remove all team resources except models. Move models to deprecated directory 2013-06-18 21:22:34 +03:00
Dmitriy Zaporozhets e7c930a55b Add imported boolean to project. Prevent shell from creating repo after it was imported 2013-06-14 16:30:48 +03:00
Dmitriy Zaporozhets 0ee2668a4f Fixed users_select_tag method 2013-06-11 14:27:27 +03:00
Dmitriy Zaporozhets 6eb045fc98 Prevent Project.all & User.all in selectboxes 2013-06-11 14:17:37 +03:00
Dmitriy Zaporozhets 8da7c3bfbc Merge pull request #4178 from docwhat/use-COLOR_SCHEMES
design pages now uses the COLOR_SCHEMES
2013-06-06 08:24:10 -07:00
Dmitriy Zaporozhets 20ce3980d3 public_icon, private_icon helpers 2013-06-06 14:02:29 +03:00
Christian Höltje 15d54b2964 design pages now uses the COLOR_SCHEMES
This unifies the code color-scheme code and makes
adding new schemes a little easier.
2013-06-05 11:17:13 -04:00
Christian Höltje 336750c916 user_color_scheme_class with current_user
This refactors the `user_color_scheme_class` to use
a hash with a default.  This prevents problems
with workers that don't have access to the
current_user.

Fixes issue #2758
2013-06-03 11:39:46 -04:00
Dmitriy Zaporozhets 84e4cfc6bb Prevent mailer error when note with code highlight 2013-05-30 09:46:02 +03:00
Dmitriy Zaporozhets a3645b5b4d Restyle login page for LDAP/regular login 2013-05-24 19:43:47 +03:00
Dmitriy Zaporozhets aee110e20d Add extra config for some advanced customization 2013-05-08 21:03:14 +03:00
Dmitriy Zaporozhets 2aa620c25a move more inline js to handle via dispatcher 2013-05-02 11:46:45 +03:00
Dmitriy Zaporozhets ca225d92c3 Replace inline document.ready with dispatcher 2013-05-02 11:18:29 +03:00
Jared Szechy d4688af39c Add monokai highlighting theme 2013-04-23 16:30:50 -04:00
Dmitriy Zaporozhets b20bd1b605 Merge pull request #3625 from chr1831/master
Use secure Gravatar url when https is set to true in the configuration
2013-04-19 12:56:57 -07:00
Dmitriy Zaporozhets 1a0082b46b hime last push widget if user already has MR created 2013-04-19 21:19:16 +03:00
Sylas 1a92ae9fcb Override gravatar url to use SSL if gitlab has the SSL flag set to true. 2013-04-17 21:34:08 -07:00
Dmitriy Zaporozhets ae2233b114 Improve perfomance by using project.last_activity_at in project_last_activity helper 2013-04-09 20:53:27 +03:00
Dmitriy Zaporozhets 541d899410 Project.repository should never be nil so you can call repository.exists? or repository.empty?
Also specify separate project factory for project with filled repo
2013-04-01 16:56:25 +03:00
Dmitriy Zaporozhets 57f3409bcc move Wall to own resource 2013-03-19 12:35:42 +02:00
Dmitriy Zaporozhets 8cad1c9f4c add dark solarized theme for code preview 2013-03-15 15:09:34 +02:00
Dmitriy Zaporozhets 4673c85379 add teams to search autocomplete 2013-03-14 12:43:08 +02:00
Dmitriy Zaporozhets bdcaf21ea7 Allow single/multiple user select 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets bf17d976a7 add api users filter and integrate users select2 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets c2ba868c9b Merge pull request #2954 from cabeca/fix-image-url-emoji
Fix image url for emoji.
2013-03-05 05:52:01 -08:00
Dmitriy Zaporozhets db8baf2895 Since search_autocomplete_source rendered with raw all human input should be sanitized to prevent XSS 2013-02-25 22:12:11 +02:00
Dmitriy Zaporozhets 020078663e Prevent xss attack over group name. Added regex validation for group and team name 2013-02-18 09:28:18 +02:00
Miguel Cabeça 157b038661 Include Riyad Preukschas suggestions. 2013-02-17 13:02:22 +00:00
Miguel Cabeça f6957f7658 Fix image url for emoji. 2013-02-11 12:22:06 +00:00
Dmitriy Zaporozhets 6350b32a3d Fix security issues with teams 2013-01-25 15:51:45 +02:00
Dmitriy Zaporozhets ac8247b46d Improved search. added filters 2013-01-25 10:07:21 +02:00
Riyad Preukschas 8a5b770c36 Reorder help routes 2013-01-19 15:26:23 +01:00
Riyad Preukschas 8db80f1f6d Rename help#public_area to help#public_access 2013-01-19 15:24:51 +01:00
Riyad Preukschas 16b5417842 Use image Urls for Emoji in GFM
Fixes #2617
2013-01-16 22:39:45 +01:00
Cyril 8a3bbbdb88 clean app helper
* remove unused method
* simplify gravatar_icon
2013-01-10 01:46:23 +01:00
Dmitriy Zaporozhets dccd8b6eaa Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
Dmitriy Zaporozhets 39ba934c0a REpostiry, Team models 2013-01-03 21:09:18 +02:00
Dmitriy Zaporozhets a16533a04a Add groups to search autocomplete. Use alphabetically scope for users order 2012-12-30 13:50:23 +02:00
Riyad Preukschas 757c7a5291 Fix gravatar and ldap config 2012-12-20 16:54:28 +01:00
Riyad Preukschas 19eb637419 Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
Johannes Schleifenbaum 3a48177762 add help raketasks to search autocomplete 2012-12-08 17:35:10 +01:00
Sergey Linnik 0aa7f79ca4 allow customize gravatar url 2012-12-07 00:44:22 +04:00
Sergey Linnik 2c37fa381e fix some glitches in gravatar image url generation
always use proper size value
do not show alt text when avatar image not loaded
2012-12-07 00:03:13 +04:00
Riyad Preukschas 184a9ecaf6 Add user_color_scheme_class helper 2012-11-27 22:51:05 +01:00
Dmitriy Zaporozhets 81f8114f24 NamespacesHelper 2012-11-27 17:48:25 +02:00
Dmitriy Zaporozhets f5551efdfd Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues 2012-11-27 09:31:15 +03:00
Dmitriy Zaporozhets cc52eed981 Show namespace in search autocomplete 2012-11-27 07:29:11 +03:00
Dmitriy Zaporozhets 0e1635a68a Fixing requests after namespaces. Fixed admin bug with access to project 2012-11-23 22:25:28 +02:00
Dmitriy Zaporozhets f17ddeb394 Make admin project list more useful 2012-11-23 07:24:09 +03:00
Dmitriy Zaporozhets 2b683b0d0b Ability to create project with namespace 2012-11-23 07:11:09 +03:00
Dmitriy Zaporozhets 949233aa1f Changed default icon for gravatar. Moved filter out of layout 2012-11-06 13:47:43 +02:00
Riyad Preukschas ce91014730 Fix use of Emoji 2012-10-18 01:10:35 +02:00
Riyad Preukschas 64008b9ec7 Improve search suggestions 2012-10-12 01:02:28 +02:00
Riyad Preukschas eb92813757 Move emoji auto-complete helper to ApplicationHelper 2012-10-10 00:53:42 +02:00
Dmitriy Zaporozhets 2c8d3c33ff Fixed ref switcher 2012-09-27 09:53:42 +03:00
Robert Speicher aa0c4b77b6 Add current_action? helper 2012-09-26 16:32:26 -04:00
Robert Speicher adcc6a0b0e Move tab_class helper to TabHelper 2012-09-26 16:32:24 -04:00
Robert Speicher 60ac6a28a2 Allow current_controller? helper to take an Array of options 2012-09-26 16:32:24 -04:00
Robert Speicher 3ad931ca92 Add current_controller? helper method
Simplifies some of the "active tab" checks we're doing
2012-09-26 16:32:23 -04:00
Robert Speicher 79a02df92e Update usages of tree_file_project_ref_path to project_tree_path 2012-09-26 16:32:21 -04:00
Robert Speicher 95bd93fe1a Remove Projects#team action
Uses TeamMembers#index instead, to be more RESTful
2012-09-16 10:07:06 -04:00
Dmitriy Zaporozhets dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
Dmitriy Zaporozhets fa4150d47d Cleanup after omniauth 2012-09-12 08:23:20 +03:00
Dmitriy Zaporozhets 621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
2012-09-12 06:49:52 +03:00
Dmitriy Zaporozhets 793db070f0 Restyled projects list on dashboard 2012-08-30 08:13:36 +03:00
Florian Unglaub 48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
Dmitriy Zaporozhets 1ef1a4ae6e Merge pull request #1239 from tsigo/disable_gravatar
Allow disabling Gravatars in gitlab.yml settings
2012-08-22 04:33:50 -07:00
Florian Unglaub a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00