gitorious:mainline.git
4 years agoFix MR order on project page
Piotr Solnica [Tue, 22 Oct 2013 07:07:21 +0000 (09:07 +0200)]
Fix MR order on project page

4 years agoRemove viewport meta tag for now
Piotr Solnica [Tue, 22 Oct 2013 07:01:26 +0000 (09:01 +0200)]
Remove viewport meta tag for now

4 years agoRemove viewport meta tag for now
Piotr Solnica [Tue, 22 Oct 2013 07:01:26 +0000 (09:01 +0200)]
Remove viewport meta tag for now

4 years agoUpdate ui3
Piotr Solnica [Mon, 21 Oct 2013 19:01:04 +0000 (21:01 +0200)]
Update ui3

4 years agoUpdate ui3
Piotr Solnica [Mon, 21 Oct 2013 19:00:32 +0000 (21:00 +0200)]
Update ui3

4 years agoFix comment view when body is empty
Piotr Solnica [Mon, 21 Oct 2013 18:24:07 +0000 (20:24 +0200)]
Fix comment view when body is empty

4 years agoFix image path
Piotr Solnica [Mon, 21 Oct 2013 18:18:14 +0000 (20:18 +0200)]
Fix image path

4 years agoUpdate ui3
Piotr Solnica [Mon, 21 Oct 2013 17:58:01 +0000 (19:58 +0200)]
Update ui3

4 years agoAdd custom class to "View all diffs" button
Piotr Solnica [Mon, 21 Oct 2013 17:57:36 +0000 (19:57 +0200)]
Add custom class to "View all diffs" button

4 years agoReplace screenshot rotator with a new screen (just 1 for now)
Piotr Solnica [Mon, 21 Oct 2013 18:14:13 +0000 (20:14 +0200)]
Replace screenshot rotator with a new screen (just 1 for now)

4 years agoFix setting page title
Piotr Solnica [Mon, 21 Oct 2013 15:05:35 +0000 (17:05 +0200)]
Fix setting page title

4 years agoMute project descriptions in main activities view
Piotr Solnica [Mon, 21 Oct 2013 15:01:12 +0000 (17:01 +0200)]
Mute project descriptions in main activities view

4 years agoUpdate repository box in project page
Piotr Solnica [Mon, 21 Oct 2013 14:53:55 +0000 (16:53 +0200)]
Update repository box in project page

4 years agoUpdate active users box
Piotr Solnica [Mon, 21 Oct 2013 14:49:44 +0000 (16:49 +0200)]
Update active users box

4 years agoFix broken CSS
Christian Johansen [Mon, 21 Oct 2013 14:41:15 +0000 (16:41 +0200)]
Fix broken CSS

4 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Mon, 21 Oct 2013 14:19:31 +0000 (16:19 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

4 years agoCorrectly set diff mode
Christian Johansen [Mon, 21 Oct 2013 14:18:55 +0000 (16:18 +0200)]
Correctly set diff mode

URL params are strings, not symbols

4 years agoDon't crash parse_commit_message on empty commit message
Marcin Kulik [Mon, 21 Oct 2013 14:03:49 +0000 (16:03 +0200)]
Don't crash parse_commit_message on empty commit message

4 years agoFix repository collaborators page with groups
Adam Pohorecki [Mon, 21 Oct 2013 13:57:34 +0000 (15:57 +0200)]
Fix repository collaborators page with groups

4 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Mon, 21 Oct 2013 13:29:06 +0000 (15:29 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

Conflicts:
public/dist/css/gitorious3.min.css

4 years agoFix pjax response for "My details" user settings tab
Marcin Kulik [Mon, 21 Oct 2013 13:07:10 +0000 (15:07 +0200)]
Fix pjax response for "My details" user settings tab

4 years agoRemove unnecessary method_missing in ProjectValidator
Adam Pohorecki [Mon, 21 Oct 2013 12:32:13 +0000 (14:32 +0200)]
Remove unnecessary method_missing in ProjectValidator

4 years agoTranslate validation messages in UpdateProjectValidator
Adam Pohorecki [Mon, 21 Oct 2013 12:23:32 +0000 (14:23 +0200)]
Translate validation messages in UpdateProjectValidator

4 years agoDisallow removal of default merge request status
Adam Pohorecki [Mon, 21 Oct 2013 10:46:41 +0000 (12:46 +0200)]
Disallow removal of default merge request status

4 years agoUpdate css bundle
Marcin Kulik [Mon, 21 Oct 2013 11:23:30 +0000 (13:23 +0200)]
Update css bundle

4 years agoUpdate ui3
Piotr Solnica [Mon, 21 Oct 2013 11:21:08 +0000 (13:21 +0200)]
Update ui3

4 years agoUpdate css bundle
Marcin Kulik [Mon, 21 Oct 2013 11:11:37 +0000 (13:11 +0200)]
Update css bundle

4 years agoUpdate ui3
Piotr Solnica [Mon, 21 Oct 2013 11:03:54 +0000 (13:03 +0200)]
Update ui3

4 years agoAdd confirmation to delete team button
Piotr Solnica [Mon, 21 Oct 2013 10:24:59 +0000 (12:24 +0200)]
Add confirmation to delete team button

4 years agoUpdate css bundle
Marcin Kulik [Mon, 21 Oct 2013 10:18:02 +0000 (12:18 +0200)]
Update css bundle

4 years agoSmaller UI tweaks in activities index
Piotr Solnica [Mon, 21 Oct 2013 10:16:27 +0000 (12:16 +0200)]
Smaller UI tweaks in activities index

4 years agoUpdate ui3
Piotr Solnica [Mon, 21 Oct 2013 10:14:38 +0000 (12:14 +0200)]
Update ui3

4 years agoUnify project and team index pages
Piotr Solnica [Mon, 21 Oct 2013 10:14:06 +0000 (12:14 +0200)]
Unify project and team index pages

4 years agoUpdate ui3
Piotr Solnica [Mon, 21 Oct 2013 09:56:22 +0000 (11:56 +0200)]
Update ui3

4 years agoUp UI build
Christian Johansen [Mon, 21 Oct 2013 09:52:41 +0000 (11:52 +0200)]
Up UI build

4 years agoMove "Add project" to the right on project index
Piotr Solnica [Mon, 21 Oct 2013 09:51:45 +0000 (11:51 +0200)]
Move "Add project" to the right on project index

4 years agoUpdate ui3
Piotr Solnica [Mon, 21 Oct 2013 09:48:17 +0000 (11:48 +0200)]
Update ui3

4 years agoAdd back team index and refactor its HTML
Piotr Solnica [Mon, 21 Oct 2013 09:47:51 +0000 (11:47 +0200)]
Add back team index and refactor its HTML

4 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Mon, 21 Oct 2013 09:34:33 +0000 (11:34 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

4 years agoRef selector on commits and graphs pages
Christian Johansen [Mon, 21 Oct 2013 09:34:29 +0000 (11:34 +0200)]
Ref selector on commits and graphs pages

4 years agoUpdate ui3
Piotr Solnica [Mon, 21 Oct 2013 09:06:02 +0000 (11:06 +0200)]
Update ui3

4 years agoMove Add project to the header in activities index
Piotr Solnica [Mon, 21 Oct 2013 09:05:31 +0000 (11:05 +0200)]
Move Add project to the header in activities index

4 years agoUp UI build
Christian Johansen [Mon, 21 Oct 2013 08:56:20 +0000 (10:56 +0200)]
Up UI build

4 years agoRemove outdated and outcommented tests
Christian Johansen [Mon, 21 Oct 2013 08:49:03 +0000 (10:49 +0200)]
Remove outdated and outcommented tests

4 years agoReplace repository_tree_path with tree_entry_url
Christian Johansen [Mon, 21 Oct 2013 08:47:05 +0000 (10:47 +0200)]
Replace repository_tree_path with tree_entry_url

The repository_tree_path route is around for one reason only;
backwards-compatibility. It allows us to support */trees/* URLs that
used to be supported. The controller redirects to the source browser. We
should not be generating links to this controller.

4 years agoClean up in dashboard/user profile/team page
Piotr Solnica [Mon, 21 Oct 2013 07:29:31 +0000 (09:29 +0200)]
Clean up in dashboard/user profile/team page

  * Move "watched" pullbox to dashabord where it really should belong
  * Simplify pullbox titles
  * Consistently display projects before repositories
  * Move action button to the pullbox header
  * Rename "Your activities" to "Activities" in the user profile page

4 years agoUpdate ui3
Piotr Solnica [Sun, 20 Oct 2013 10:17:26 +0000 (12:17 +0200)]
Update ui3

4 years agoClean up community view a bit
Piotr Solnica [Sun, 20 Oct 2013 10:14:55 +0000 (12:14 +0200)]
Clean up community view a bit

  * Use group avatars
  * Fix spacing in table
  * Replace huge headers with gts-legend headers

4 years agoRemove huge headers from commits/graphs index pages
Piotr Solnica [Sun, 20 Oct 2013 10:03:53 +0000 (12:03 +0200)]
Remove huge headers from commits/graphs index pages

4 years agoClean up wiki views
Piotr Solnica [Sun, 20 Oct 2013 09:56:31 +0000 (11:56 +0200)]
Clean up wiki views

4 years agoUse modal_box helper in mr#show view
Piotr Solnica [Sun, 20 Oct 2013 09:33:12 +0000 (11:33 +0200)]
Use modal_box helper in mr#show view

4 years agoClean up mr index on project page
Piotr Solnica [Sun, 20 Oct 2013 09:26:14 +0000 (11:26 +0200)]
Clean up mr index on project page

4 years agoRemove unneeded markup from projects#show view
Piotr Solnica [Sat, 19 Oct 2013 11:50:43 +0000 (13:50 +0200)]
Remove unneeded markup from projects#show view

4 years agoUpdate ui3
Piotr Solnica [Sat, 19 Oct 2013 11:48:48 +0000 (13:48 +0200)]
Update ui3

4 years agoUnify user-settings views
Piotr Solnica [Sat, 19 Oct 2013 11:48:01 +0000 (13:48 +0200)]
Unify user-settings views

4 years agoUpdate ui3
Piotr Solnica [Sat, 19 Oct 2013 08:37:08 +0000 (10:37 +0200)]
Update ui3

4 years agoClean up membership edit and index views
Piotr Solnica [Sat, 19 Oct 2013 08:36:35 +0000 (10:36 +0200)]
Clean up membership edit and index views

4 years agoFix issues in group handling
Piotr Solnica [Fri, 18 Oct 2013 17:21:18 +0000 (19:21 +0200)]
Fix issues in group handling

  * Fix case when creator of a group is being demoted
  * Fix error handling in forms
  * Refactor update action to a use-case

4 years agoAdd back required js file
Piotr Solnica [Fri, 18 Oct 2013 12:01:15 +0000 (14:01 +0200)]
Add back required js file

4 years agoRemove redundant markup from dashboard template
Piotr Solnica [Fri, 18 Oct 2013 11:56:47 +0000 (13:56 +0200)]
Remove redundant markup from dashboard template

4 years agoAdd integration test for mr#show
Piotr Solnica [Fri, 18 Oct 2013 11:46:57 +0000 (13:46 +0200)]
Add integration test for mr#show

  * I actually had this test stashed, wrote it when fixing a bug on that
    page, the reason it wasn't pushed before was db conn issues we had,
    they are gone now so I'm adding the test

4 years agoSend Resque exceptions to Airbrake
Marcin Kulik [Fri, 18 Oct 2013 11:00:54 +0000 (13:00 +0200)]
Send Resque exceptions to Airbrake

4 years agoFix repository community tab. Closes #307
Adam Pohorecki [Fri, 18 Oct 2013 10:22:50 +0000 (12:22 +0200)]
Fix repository community tab. Closes #307

4 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Fri, 18 Oct 2013 10:14:02 +0000 (12:14 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

Conflicts:
lib/tasks/assets.rake

4 years agoUp UI
Christian Johansen [Fri, 18 Oct 2013 10:13:20 +0000 (12:13 +0200)]
Up UI

4 years agoRemove some accidental raise O_o
Marcin Kulik [Fri, 18 Oct 2013 10:12:09 +0000 (12:12 +0200)]
Remove some accidental raise O_o

4 years agoRemove assets tasks, no longer needed
Christian Johansen [Fri, 18 Oct 2013 10:10:37 +0000 (12:10 +0200)]
Remove assets tasks, no longer needed

4 years agoQuick fix for description-less projects
Piotr Solnica [Fri, 18 Oct 2013 09:58:12 +0000 (11:58 +0200)]
Quick fix for description-less projects

4 years agoDon't show HTTP(S) clone URL when HTTP cloning is disabled
Marcin Kulik [Fri, 18 Oct 2013 09:46:03 +0000 (11:46 +0200)]
Don't show HTTP(S) clone URL when HTTP cloning is disabled

4 years agoUpdate ui3
Piotr Solnica [Fri, 18 Oct 2013 09:42:34 +0000 (11:42 +0200)]
Update ui3

4 years agoAdd timestamp col to commits table in the mr#show
Piotr Solnica [Fri, 18 Oct 2013 09:41:53 +0000 (11:41 +0200)]
Add timestamp col to commits table in the mr#show

4 years agoFix build
Piotr Solnica [Fri, 18 Oct 2013 08:51:00 +0000 (10:51 +0200)]
Fix build

  * Add MR presenter
  * Fix test for comment presenter

4 years agoUpdate ui3
Piotr Solnica [Fri, 18 Oct 2013 08:36:06 +0000 (10:36 +0200)]
Update ui3

4 years agoChange meta-body in the event to be a span
Piotr Solnica [Fri, 18 Oct 2013 07:22:05 +0000 (09:22 +0200)]
Change meta-body in the event to be a span

4 years agoAdd description field back to projects#new form and remove Description tab from edit...
Piotr Solnica [Thu, 17 Oct 2013 17:22:22 +0000 (19:22 +0200)]
Add description field back to projects#new form and remove Description tab from edit form

4 years agoChange location of state-change info in comment
Piotr Solnica [Thu, 17 Oct 2013 16:30:21 +0000 (18:30 +0200)]
Change location of state-change info in comment

4 years agoUpdate ui3
Piotr Solnica [Thu, 17 Oct 2013 16:23:39 +0000 (18:23 +0200)]
Update ui3

4 years agoRe-work MR status bar a bit to avoid issues with long text
Piotr Solnica [Thu, 17 Oct 2013 16:23:00 +0000 (18:23 +0200)]
Re-work MR status bar a bit to avoid issues with long text

4 years agoUpdate ui3
Piotr Solnica [Thu, 17 Oct 2013 15:29:12 +0000 (17:29 +0200)]
Update ui3

4 years agoUpdate edit link to be a button and fix comment context
Piotr Solnica [Thu, 17 Oct 2013 15:28:31 +0000 (17:28 +0200)]
Update edit link to be a button and fix comment context

4 years agoDisplay no-desc info when MR has no proposal desc
Piotr Solnica [Thu, 17 Oct 2013 15:12:34 +0000 (17:12 +0200)]
Display no-desc info when MR has no proposal desc

4 years agoAdd CommitRangeSelector (ported from all.js)
Piotr Solnica [Thu, 17 Oct 2013 15:10:14 +0000 (17:10 +0200)]
Add CommitRangeSelector (ported from all.js)

4 years agoFix timestamp in comments
Piotr Solnica [Thu, 17 Oct 2013 14:58:59 +0000 (16:58 +0200)]
Fix timestamp in comments

4 years agoRework comment views a bit
Piotr Solnica [Thu, 17 Oct 2013 14:24:47 +0000 (16:24 +0200)]
Rework comment views a bit

4 years agoFix utf8 issue in Diff::Renderer
Pawel Pierzchala [Thu, 17 Oct 2013 13:33:49 +0000 (15:33 +0200)]
Fix utf8 issue in Diff::Renderer

4 years agoFix blob_helper_test
Pawel Pierzchala [Thu, 17 Oct 2013 13:17:39 +0000 (15:17 +0200)]
Fix blob_helper_test

4 years agoUse DatabaseCleaner in integration tests
Pawel Pierzchala [Thu, 17 Oct 2013 13:15:30 +0000 (15:15 +0200)]
Use DatabaseCleaner in integration tests

4 years agoRemove description presence requirement from project validator
Marcin Kulik [Thu, 17 Oct 2013 12:56:58 +0000 (14:56 +0200)]
Remove description presence requirement from project validator

4 years agoFix rails autoload issue with CommentValidators
Pawel Pierzchala [Thu, 17 Oct 2013 12:54:09 +0000 (14:54 +0200)]
Fix rails autoload issue with CommentValidators

4 years agoHandle removed author when rendering comments
Pawel Pierzchala [Thu, 17 Oct 2013 11:15:00 +0000 (13:15 +0200)]
Handle removed author when rendering comments

4 years agoUpdate ui3
Marcin Kulik [Thu, 17 Oct 2013 12:45:11 +0000 (14:45 +0200)]
Update ui3

4 years agoRemove all Google Analytics related code
Marcin Kulik [Thu, 17 Oct 2013 12:38:42 +0000 (14:38 +0200)]
Remove all Google Analytics related code

4 years agoUpdate ui3
Piotr Solnica [Thu, 17 Oct 2013 12:04:23 +0000 (14:04 +0200)]
Update ui3

4 years agoUpdate MR#show page
Piotr Solnica [Thu, 17 Oct 2013 12:02:38 +0000 (14:02 +0200)]
Update MR#show page

  * Always show commit list in a separate pull-box
  * Display help content in a modal
  * Move help link to the commits pull-box header

4 years agoMove Google Analytics account id to gitorious.yml
Marcin Kulik [Thu, 17 Oct 2013 11:15:54 +0000 (13:15 +0200)]
Move Google Analytics account id to gitorious.yml

4 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Thu, 17 Oct 2013 10:57:08 +0000 (12:57 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

4 years agoRemove dead helper
Marcin Kulik [Thu, 17 Oct 2013 10:29:34 +0000 (12:29 +0200)]
Remove dead helper

4 years agoFix port number in URLs sent via emails
Marcin Kulik [Thu, 17 Oct 2013 10:27:15 +0000 (12:27 +0200)]
Fix port number in URLs sent via emails

4 years agoRemove dead assets
Christian Johansen [Thu, 17 Oct 2013 09:12:09 +0000 (11:12 +0200)]
Remove dead assets

4 years agoUpdate virtus
Piotr Solnica [Wed, 16 Oct 2013 22:57:06 +0000 (00:57 +0200)]
Update virtus