Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-24Use Projects::CreateService to fork projects so that after-create hooks are run.Douwe Maan
2015-04-06Change text of project creation event for imports.Douwe Maan
2015-03-18List new commits for newly pushed branch in activity view.Douwe Maan
2015-03-17Merge branch 'atom-xhtml-squashed' into 'master'Douwe Maan
Fix invalid Atom feeds when using emoji, horizontal rules, or images This is a fix for issues #880, #723, #1113. Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like *img* and *hr* are not terminated and make the Atom XML invalid. Such tags are generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images. To pass this option through from the relevant Haml templates to the proper place in the `gfm()` method, a new method `gfm_with_options()` is introduced. It reuses the options dictionary passed to `markdown()` and interprets options `xhtml` and `parse_tasks` from it (the latter was a convenient replacement for `gfm_with_tasks()`). `xhtml` is already interpreted by Redcarpet::Render::HTML, but that alone was not sufficient, because the post-processing in `gfm()` would convert its XHTML tags back to HTML. I found no way of passing additional optional options to the existing `gfm()` method without requiring updates to existing callers and without getting in the way of the existing optional arguments, but maybe someone who knows more about Ruby than I can think of one. Thorough review appreciated since this is the first time I have used Ruby. See merge request !344
2015-03-17Fix invalid Atom feeds when using emoji, horizontal rules, or images.Christian Walther
Fixes issues #880, #723, #1113: Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like <img> and <hr>, generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images, are not terminated and make the Atom XML invalid.
2015-03-14Refactor buttonsDmitriy Zaporozhets
2015-03-10Add starred projects page to dashboardDmitriy Zaporozhets
2015-02-24Merge branch 'master' into extend_markdown_uploadDouwe Maan
# Conflicts: # app/views/projects/issues/_form.html.haml # app/views/projects/merge_requests/_form.html.haml # app/views/projects/merge_requests/_new_submit.html.haml # app/views/projects/milestones/_form.html.haml # app/views/projects/notes/_form.html.haml # app/views/projects/wikis/_form.html.haml # config/routes.rb # spec/controllers/projects_controller_spec.rb
2015-02-20Split up AttachmentUploader.Douwe Maan
2015-02-20Merge branch 'master' into rails-4.1.9Vinnie Okada
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-14Upgrade to Rails 4.1.9Vinnie Okada
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-14Make sure twitter widgets are loaded when rendered through turbolinks.Douwe Maan
2015-02-14Change tweet text.Douwe Maan
2015-02-13Add link to share via twitter to "created project" event.Douwe Maan
2015-02-13Refactor event title generation for more consistent messages.Douwe Maan
Example: "User joined project Namespace / Project" rather than "User joined project at Namespace / Project"
2015-01-29Add a commit calendar to the user profileHannes Rosenögger
2014-10-10Use short_id instead of [0..N] for short version of commit shaDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-03Upgrade to Font Awesome v4.2Sullivan SENECHAL
2014-09-20Increase atom feed test coverage. Prevent 500 error if description is missingDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-26Fix missing links and incorrect display of issue numbers for notes, ↵Matthew McMillion
comments, and merge requests
2014-07-02Merge branch 'bugfix/305/dashboard_feed_summaries' into 'master'Dmitriy Zaporozhets
Incorporate Summaries for Notes and Merge Requests Into Dashboard Feed This MR fixes #305 by adding summaries for notes and merge requests into the dashboard feed.
2014-07-01Updated ATOM feed partials to use markdown instead of simple_format.Kyle Fazzari
2014-06-11Merge pull request #7024 from skv-headless/linkto_issues_on_main_dashboardDmitriy Zaporozhets
links to issues on main dashboard
2014-05-29Add summaries for notes and merge requests to dashboard feed.Kyle Fazzari
This fixes #305.
2014-05-27Use css truncation on dashboardDmitriy Zaporozhets
2014-05-26links to issues on main dashboardskv
2014-01-14Temporary fix for #4305: Cant preview attached png images on notes; ↵Javier Castro
attachment.secure_url returns an url which is accessible
2013-12-30Remove unnecessary ago keywordDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-30Use jquery timeago pluginDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-15Add time ago tooltips to show actual date/timeDrew Blessing
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-11Dashboard avatars: No need to load 40px images if we render them in 24pxDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-28Drop rjs from Infinite scrollingDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-01Show only first line of commit message on dashboardDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-10-10Remove unnecessary tagDmitriy Zaporozhets
2013-10-09avatar upload on profile pageSteven Thonus
2013-09-11Truncate some text from dashboard eventsDmitriy Zaporozhets
2013-09-10UI fixes for commits listsDmitriy Zaporozhets
2013-08-20Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets
2013-08-20Render small avatars for inline eventsDmitriy Zaporozhets
2013-08-20Fix event image previewDmitriy Zaporozhets
2013-08-19Show iid in event feed and uatocomplete as default id for issues, mrDmitriy Zaporozhets
2013-08-16Dont render event body if emptyDmitriy Zaporozhets
2013-08-16Minor UI improvements to event feedDmitriy Zaporozhets
2013-07-17Restyle MR form pageDmitriy Zaporozhets
2013-07-17Restyle last push widgetDmitriy Zaporozhets
2013-07-11Open note image attachment in new tabDmitriy Zaporozhets
2013-06-26Gravatar image fixes when gravatar unavailableIzaak Alpert
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26) Conflicts: app/assets/stylesheets/themes/ui_bb.scss app/views/snippets/_snippet.html.haml Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
2013-06-07Refactor event title for notesDmitriy Zaporozhets
2013-06-07Fix event note outputDmitriy Zaporozhets
2013-06-07Fix dashboard lost if comment on commitDmitriy Zaporozhets