OSDN Git Service

wvm/gitlab.git
11 years agogitolite-client fork replaced with origin gem
randx [Thu, 27 Sep 2012 14:00:13 +0000 (17:00 +0300)]
gitolite-client fork replaced with origin gem

11 years agoFix blame markup & breadcrubs for commits
Dmitriy Zaporozhets [Thu, 27 Sep 2012 08:58:41 +0000 (11:58 +0300)]
Fix blame markup & breadcrubs for commits

11 years agoMerge branch 'tsigo-routing_overhaul'
Dmitriy Zaporozhets [Thu, 27 Sep 2012 06:56:02 +0000 (09:56 +0300)]
Merge branch 'tsigo-routing_overhaul'

11 years agoFixed ref switcher
Dmitriy Zaporozhets [Thu, 27 Sep 2012 06:53:42 +0000 (09:53 +0300)]
Fixed ref switcher

11 years agoFixed updir method. Fixed breadcrumbs for commits
Dmitriy Zaporozhets [Thu, 27 Sep 2012 06:49:00 +0000 (09:49 +0300)]
Fixed updir method. Fixed breadcrumbs for commits

11 years agoRemove app_menu and project_menu partials
Robert Speicher [Wed, 26 Sep 2012 21:00:52 +0000 (17:00 -0400)]
Remove app_menu and project_menu partials

Now it's consistent across layouts where their main menus are.

11 years agoRoutes are now final
Robert Speicher [Wed, 26 Sep 2012 20:45:00 +0000 (16:45 -0400)]
Routes are now final

11 years agoReplace various "active tab" checks with nav_link
Robert Speicher [Wed, 26 Sep 2012 20:14:17 +0000 (16:14 -0400)]
Replace various "active tab" checks with nav_link

Also remove now-unused tab_class helper

11 years agoAdd nav_link helper to TabHelper
Robert Speicher [Wed, 26 Sep 2012 20:13:23 +0000 (16:13 -0400)]
Add nav_link helper to TabHelper

11 years agoAdd current_action? helper
Robert Speicher [Wed, 26 Sep 2012 19:06:07 +0000 (15:06 -0400)]
Add current_action? helper

11 years agoUse Rails.root.join where appropriate
Robert Speicher [Wed, 26 Sep 2012 18:52:01 +0000 (14:52 -0400)]
Use Rails.root.join where appropriate

11 years agoSpeed up Compare feature step
Robert Speicher [Wed, 26 Sep 2012 17:58:50 +0000 (13:58 -0400)]
Speed up Compare feature step

11 years agoSpeed up request specs a bit
Robert Speicher [Wed, 26 Sep 2012 17:43:42 +0000 (13:43 -0400)]
Speed up request specs a bit

11 years agoAdd branches and tags Repo methods
Robert Speicher [Wed, 26 Sep 2012 17:38:14 +0000 (13:38 -0400)]
Add branches and tags Repo methods

Simplifies the actions in RepositoriesController

11 years agoRename branches and tags Repo methods to branch_names and tag_names
Robert Speicher [Wed, 26 Sep 2012 17:34:51 +0000 (13:34 -0400)]
Rename branches and tags Repo methods to branch_names and tag_names

11 years agoRemove atom Dashboard spec that no longer applies
Robert Speicher [Wed, 26 Sep 2012 17:23:19 +0000 (13:23 -0400)]
Remove atom Dashboard spec that no longer applies

11 years agoClean up project access spec
Robert Speicher [Wed, 26 Sep 2012 17:22:30 +0000 (13:22 -0400)]
Clean up project access spec

11 years agoFix GFM request spec
Robert Speicher [Wed, 26 Sep 2012 17:21:55 +0000 (13:21 -0400)]
Fix GFM request spec

11 years agoFix Repository role spec
Robert Speicher [Wed, 26 Sep 2012 17:21:38 +0000 (13:21 -0400)]
Fix Repository role spec

11 years agoFix logs not showing in Tree for the root path
Robert Speicher [Wed, 26 Sep 2012 03:56:27 +0000 (23:56 -0400)]
Fix logs not showing in Tree for the root path

11 years agoAdd CommitsController spec to make sure atom feeds work
Robert Speicher [Wed, 26 Sep 2012 03:40:04 +0000 (23:40 -0400)]
Add CommitsController spec to make sure atom feeds work

11 years agoFix paths in commits/_head
Robert Speicher [Wed, 26 Sep 2012 03:39:50 +0000 (23:39 -0400)]
Fix paths in commits/_head

11 years agoUse current ref for Files and Commits if available
Robert Speicher [Wed, 26 Sep 2012 03:39:28 +0000 (23:39 -0400)]
Use current ref for Files and Commits if available

Closes #1452

11 years agoFix the remaining actions in RefsController
Robert Speicher [Wed, 26 Sep 2012 03:34:52 +0000 (23:34 -0400)]
Fix the remaining actions in RefsController

11 years agoRemove commit_tab_class helper
Robert Speicher [Wed, 26 Sep 2012 03:34:26 +0000 (23:34 -0400)]
Remove commit_tab_class helper

11 years agoFix various links
Robert Speicher [Wed, 26 Sep 2012 03:33:42 +0000 (23:33 -0400)]
Fix various links

11 years agoCompare views and cleanup
Robert Speicher [Wed, 26 Sep 2012 03:13:19 +0000 (23:13 -0400)]
Compare views and cleanup

- Remove compare/_head and just use commits/_head since they're identical
- Add index view; extract the form into a partial

11 years agoAdd Compare#index and Compare#create actions
Robert Speicher [Wed, 26 Sep 2012 03:10:50 +0000 (23:10 -0400)]
Add Compare#index and Compare#create actions

Create just redirects to our specially-formatted #show action

11 years agoUse current_controller? in layouts/_head partial
Robert Speicher [Wed, 26 Sep 2012 02:41:25 +0000 (22:41 -0400)]
Use current_controller? in layouts/_head partial

11 years agoAdd feature steps for a generic, non-"Shop" project
Robert Speicher [Wed, 26 Sep 2012 02:34:29 +0000 (22:34 -0400)]
Add feature steps for a generic, non-"Shop" project

This group is better for features that only deal with one project.

11 years agoUpdates to routing specs
Robert Speicher [Wed, 26 Sep 2012 02:32:54 +0000 (22:32 -0400)]
Updates to routing specs

11 years agoChange active tab and nav class to "active"
Robert Speicher [Wed, 26 Sep 2012 02:07:41 +0000 (22:07 -0400)]
Change active tab and nav class to "active"

The main nav used active, the sub nav used current. This normalizes it.

11 years agoMove tab_class helper to TabHelper
Robert Speicher [Wed, 26 Sep 2012 01:18:39 +0000 (21:18 -0400)]
Move tab_class helper to TabHelper

11 years agoAllow current_controller? helper to take an Array of options
Robert Speicher [Wed, 26 Sep 2012 01:18:00 +0000 (21:18 -0400)]
Allow current_controller? helper to take an Array of options

11 years agoAdd features for checking the "Active Tab" across various pages
Robert Speicher [Wed, 26 Sep 2012 00:11:57 +0000 (20:11 -0400)]
Add features for checking the "Active Tab" across various pages

11 years agoLimit commit history to 5 in Spinach
Robert Speicher [Wed, 26 Sep 2012 00:01:51 +0000 (20:01 -0400)]
Limit commit history to 5 in Spinach

Speeds things up a bit

11 years agoFix atom feed links
Robert Speicher [Tue, 25 Sep 2012 23:25:14 +0000 (19:25 -0400)]
Fix atom feed links

11 years agoAdd current_controller? helper method
Robert Speicher [Tue, 25 Sep 2012 23:22:44 +0000 (19:22 -0400)]
Add current_controller? helper method

Simplifies some of the "active tab" checks we're doing

11 years agoFix Refs#switch
Robert Speicher [Tue, 25 Sep 2012 23:17:54 +0000 (19:17 -0400)]
Fix Refs#switch

11 years agoRemove check_token_auth filter
Robert Speicher [Tue, 25 Sep 2012 23:16:46 +0000 (19:16 -0400)]
Remove check_token_auth filter

Because of the way ExtractPaths works, `params[:format]` wouldn't
necessarily be available at the time this filter was running, and so it
would erroneously redirect to `new_user_session_path`

11 years agoUpdate usages of project_commit[s] route helpers
Robert Speicher [Tue, 25 Sep 2012 22:50:02 +0000 (18:50 -0400)]
Update usages of project_commit[s] route helpers

11 years agoAdd a "patch" MIME type, and render it like a normal view in Commit#show
Robert Speicher [Tue, 25 Sep 2012 22:46:19 +0000 (18:46 -0400)]
Add a "patch" MIME type, and render it like a normal view in Commit#show

11 years agoFinalize new routes
Robert Speicher [Tue, 25 Sep 2012 22:45:30 +0000 (18:45 -0400)]
Finalize new routes

11 years agoAdd an inflector to mark "commits" as uncountable
Robert Speicher [Tue, 25 Sep 2012 22:45:13 +0000 (18:45 -0400)]
Add an inflector to mark "commits" as uncountable

11 years agoFactories - Format project path and code
Robert Speicher [Tue, 25 Sep 2012 22:21:04 +0000 (18:21 -0400)]
Factories - Format project path and code

11 years agoExtractPaths - Only call assign_ref_vars on show action
Robert Speicher [Tue, 25 Sep 2012 22:20:52 +0000 (18:20 -0400)]
ExtractPaths - Only call assign_ref_vars on show action

11 years agoUse Commits#show instead of Commits#index
Robert Speicher [Thu, 20 Sep 2012 19:32:00 +0000 (15:32 -0400)]
Use Commits#show instead of Commits#index

Takes tree-ish + path as ID

11 years agoRemove Commits#compare, add CompareController
Robert Speicher [Thu, 20 Sep 2012 19:20:48 +0000 (15:20 -0400)]
Remove Commits#compare, add CompareController

11 years agoRemove unused render_full_content filter
Robert Speicher [Thu, 20 Sep 2012 18:43:38 +0000 (14:43 -0400)]
Remove unused render_full_content filter

11 years agoRename RefExtractor to ExtractsPath
Robert Speicher [Thu, 20 Sep 2012 17:55:14 +0000 (13:55 -0400)]
Rename RefExtractor to ExtractsPath

Update docs a bit

11 years agoUpdate RefExtractor to handle atom feeds
Robert Speicher [Thu, 20 Sep 2012 17:25:28 +0000 (13:25 -0400)]
Update RefExtractor to handle atom feeds

11 years agoDRY up Blame, Blob and Tree controllers
Robert Speicher [Mon, 17 Sep 2012 18:24:31 +0000 (14:24 -0400)]
DRY up Blame, Blob and Tree controllers

11 years agoAdd BlobController, remove Refs#blob
Robert Speicher [Mon, 17 Sep 2012 17:49:57 +0000 (13:49 -0400)]
Add BlobController, remove Refs#blob

11 years agoAdd BlameController, remove Refs#blame action
Robert Speicher [Mon, 17 Sep 2012 17:36:13 +0000 (13:36 -0400)]
Add BlameController, remove Refs#blame action

11 years agoAnother RefExtractor refactor
Robert Speicher [Mon, 17 Sep 2012 17:33:04 +0000 (13:33 -0400)]
Another RefExtractor refactor

11 years agoMove refs/blame view to blame/show
Robert Speicher [Mon, 17 Sep 2012 17:32:17 +0000 (13:32 -0400)]
Move refs/blame view to blame/show

11 years agoFix ref_switcher path
Robert Speicher [Mon, 17 Sep 2012 17:07:17 +0000 (13:07 -0400)]
Fix ref_switcher path

11 years agoUpdate usages of tree_file_project_ref_path to project_tree_path
Robert Speicher [Mon, 17 Sep 2012 16:39:57 +0000 (12:39 -0400)]
Update usages of tree_file_project_ref_path to project_tree_path

11 years agoAdd TreeController and spec
Robert Speicher [Mon, 17 Sep 2012 16:38:59 +0000 (12:38 -0400)]
Add TreeController and spec

11 years agoEnable tree resource, remove old tree routes
Robert Speicher [Mon, 17 Sep 2012 16:26:29 +0000 (12:26 -0400)]
Enable tree resource, remove old tree routes

11 years agoRequire 'github/markup' in Gemfile
Robert Speicher [Mon, 17 Sep 2012 15:10:04 +0000 (11:10 -0400)]
Require 'github/markup' in Gemfile

11 years agoMove tree-related views from refs to trees
Robert Speicher [Mon, 17 Sep 2012 14:57:13 +0000 (10:57 -0400)]
Move tree-related views from refs to trees

11 years agoAdd ref_extractor helper module for upcoming controllers
Robert Speicher [Mon, 17 Sep 2012 14:44:36 +0000 (10:44 -0400)]
Add ref_extractor helper module for upcoming controllers

11 years agoUse Commit#show instead of Commits#show to view a single commit
Robert Speicher [Mon, 17 Sep 2012 14:06:56 +0000 (10:06 -0400)]
Use Commit#show instead of Commits#show to view a single commit

Commits#show (plural) is going to be for showing commit history on a
specific path.

11 years agoAdd tree-ish route placeholders, modify commit(s) routes
Robert Speicher [Mon, 17 Sep 2012 14:06:03 +0000 (10:06 -0400)]
Add tree-ish route placeholders, modify commit(s) routes

11 years agoAdd routing specs for new routes
Robert Speicher [Mon, 17 Sep 2012 01:14:21 +0000 (21:14 -0400)]
Add routing specs for new routes

11 years agoAdd CommitController
Robert Speicher [Mon, 17 Sep 2012 14:08:02 +0000 (10:08 -0400)]
Add CommitController

11 years agoAdd branches method to Repository role
Robert Speicher [Sun, 16 Sep 2012 20:21:46 +0000 (16:21 -0400)]
Add branches method to Repository role

11 years agoMerge pull request #1567 from NARKOZ/mass-assignment
Dmitriy Zaporozhets [Wed, 26 Sep 2012 20:05:55 +0000 (13:05 -0700)]
Merge pull request #1567 from NARKOZ/mass-assignment

set activerecord whitelist_attributes to true [2]

11 years agoset activerecord whitelist_attributes to true
Nihad Abbasov [Wed, 26 Sep 2012 18:17:17 +0000 (11:17 -0700)]
set activerecord whitelist_attributes to true

11 years agofix mass assignment error in create_from_omniauth after a6a229a
Nihad Abbasov [Wed, 26 Sep 2012 18:06:31 +0000 (11:06 -0700)]
fix mass assignment error in create_from_omniauth after a6a229a

11 years agofix left project event
randx [Wed, 26 Sep 2012 18:05:04 +0000 (21:05 +0300)]
fix left project event

11 years agoProject activity inifinite scroll paging
randx [Wed, 26 Sep 2012 18:01:54 +0000 (21:01 +0300)]
Project activity inifinite scroll paging

11 years agoMerge pull request #1364 from AlexDenisov/fix_project_access_notification
Dmitriy Zaporozhets [Wed, 26 Sep 2012 14:21:54 +0000 (07:21 -0700)]
Merge pull request #1364 from AlexDenisov/fix_project_access_notification

Project access notifications fixed

11 years agoComment removed
Alex Denisov [Wed, 26 Sep 2012 14:01:13 +0000 (17:01 +0300)]
Comment removed

11 years agoFix milestone calendar, Removed unnecessary selects from admin
Dmitriy Zaporozhets [Wed, 26 Sep 2012 13:49:20 +0000 (16:49 +0300)]
Fix milestone calendar, Removed unnecessary selects from admin

11 years agoMerge branch 'master' into fix_project_access_notification
Alex Denisov [Wed, 26 Sep 2012 13:14:47 +0000 (16:14 +0300)]
Merge branch 'master' into fix_project_access_notification

11 years agoMerge pull request #1561 from dosire/mass_assignment
Dmitriy Zaporozhets [Wed, 26 Sep 2012 12:45:16 +0000 (05:45 -0700)]
Merge pull request #1561 from dosire/mass_assignment

Protect users projects_limit from mass assignment.

11 years agoMerge pull request #1560 from NARKOZ/refactoring
Dmitriy Zaporozhets [Wed, 26 Sep 2012 11:21:32 +0000 (04:21 -0700)]
Merge pull request #1560 from NARKOZ/refactoring

cleanup rake tasks

11 years agoProtect users projects_limit from mass assignment.
Marin Jankovski [Wed, 26 Sep 2012 11:20:44 +0000 (13:20 +0200)]
Protect users projects_limit from mass assignment.

11 years agocleanup rake tasks
Nihad Abbasov [Wed, 26 Sep 2012 11:18:10 +0000 (04:18 -0700)]
cleanup rake tasks

11 years agoMerge pull request #1553 from jouve/simplify_controllers1
Nihad Abbasov [Tue, 25 Sep 2012 21:05:26 +0000 (14:05 -0700)]
Merge pull request #1553 from jouve/simplify_controllers1

remove duplicate before_filter

11 years agoremove duplicate before_filter
Cyril [Tue, 25 Sep 2012 20:32:20 +0000 (22:32 +0200)]
remove duplicate before_filter

11 years agoMerge pull request #1534 from iamntz/emoji_alignment
Dmitriy Zaporozhets [Tue, 25 Sep 2012 19:44:03 +0000 (12:44 -0700)]
Merge pull request #1534 from iamntz/emoji_alignment

Removed float on emoji

11 years agoMerge pull request #1551 from NARKOZ/front-end
Dmitriy Zaporozhets [Tue, 25 Sep 2012 17:12:32 +0000 (10:12 -0700)]
Merge pull request #1551 from NARKOZ/front-end

add auto-completion for +1, -1 emoji

11 years agoadd auto-completion for +1, -1 emoji
Nihad Abbasov [Tue, 25 Sep 2012 11:56:21 +0000 (04:56 -0700)]
add auto-completion for +1, -1 emoji

11 years agoPollished push event
Dmitriy Zaporozhets [Tue, 25 Sep 2012 10:14:20 +0000 (13:14 +0300)]
Pollished push event

11 years agoMerge pull request #1501 from caleywoods/master
Nihad Abbasov [Mon, 24 Sep 2012 16:05:09 +0000 (09:05 -0700)]
Merge pull request #1501 from caleywoods/master

Update timeout comment in unicorn example config.

11 years agoMerge pull request #1539 from NARKOZ/front-end
Dmitriy Zaporozhets [Mon, 24 Sep 2012 13:02:34 +0000 (06:02 -0700)]
Merge pull request #1539 from NARKOZ/front-end

auto-complete for mentions in notes

11 years agoColored labels for events
Dmitriy Zaporozhets [Mon, 24 Sep 2012 10:33:51 +0000 (13:33 +0300)]
Colored labels for events

11 years agoWorking on dashboard restyle and events refactoring
Dmitriy Zaporozhets [Mon, 24 Sep 2012 09:32:51 +0000 (12:32 +0300)]
Working on dashboard restyle and events refactoring

11 years agoUp to v2.9.1 v2.9.1
Dmitriy Zaporozhets [Mon, 24 Sep 2012 07:45:55 +0000 (10:45 +0300)]
Up to v2.9.1

11 years agoRemoved float on emoji
Staicu Ionut [Mon, 24 Sep 2012 07:06:41 +0000 (10:06 +0300)]
Removed float on emoji

-`remove comment` button will not make the text jump anymore.

11 years agoauto complete team member mentions
Nihad Abbasov [Sun, 23 Sep 2012 16:52:01 +0000 (09:52 -0700)]
auto complete team member mentions

11 years agoinstall jquery-atwho-rails
Nihad Abbasov [Sun, 23 Sep 2012 15:53:48 +0000 (08:53 -0700)]
install jquery-atwho-rails

11 years agoMerge pull request #1528 from tsigo/resque_init
Dmitriy Zaporozhets [Sun, 23 Sep 2012 09:29:13 +0000 (02:29 -0700)]
Merge pull request #1528 from tsigo/resque_init

Consolidate Resque-related initializers

11 years agoMinor grammar change
Robert Speicher [Sat, 22 Sep 2012 21:06:19 +0000 (17:06 -0400)]
Minor grammar change

[ci skip]

11 years agoConsolidate all Resque-related initializers into "4_resque"
Robert Speicher [Sat, 22 Sep 2012 15:23:12 +0000 (11:23 -0400)]
Consolidate all Resque-related initializers into "4_resque"

11 years agoRename 4_resque_queues initializer to 4_resque
Robert Speicher [Sat, 22 Sep 2012 15:20:04 +0000 (11:20 -0400)]
Rename 4_resque_queues initializer to 4_resque

11 years agoMerge pull request #1522 from NARKOZ/api v2.9.0
Dmitriy Zaporozhets [Fri, 21 Sep 2012 12:35:45 +0000 (05:35 -0700)]
Merge pull request #1522 from NARKOZ/api

API clean up