OSDN Git Service

wvm/gitlab.git
12 years agoFix project redirect after destroy
randx [Fri, 22 Jun 2012 19:39:03 +0000 (22:39 +0300)]
Fix project redirect after destroy

12 years agoMerge pull request #961 from NARKOZ/load_assets_group
Dmitriy Zaporozhets [Fri, 22 Jun 2012 10:11:23 +0000 (03:11 -0700)]
Merge pull request #961 from NARKOZ/load_assets_group

load assets group to allow lazy compilation in production

12 years agoload assets group to allow lazy compilation in production
Nihad Abbasov [Fri, 22 Jun 2012 10:09:36 +0000 (03:09 -0700)]
load assets group to allow lazy compilation in production

12 years agoMerge pull request #959 from NARKOZ/raphael-js
Dmitriy Zaporozhets [Fri, 22 Jun 2012 09:15:36 +0000 (02:15 -0700)]
Merge pull request #959 from NARKOZ/raphael-js

Downgrade Raphael.js

12 years agomove assets gems to assets group
Nihad Abbasov [Fri, 22 Jun 2012 09:00:09 +0000 (02:00 -0700)]
move assets gems to assets group

12 years agodowngrade raphael js to 1.5.2
Nihad Abbasov [Fri, 22 Jun 2012 08:57:05 +0000 (01:57 -0700)]
downgrade raphael js to 1.5.2

12 years agoUp to 2.6 v2.6.0
randx [Thu, 21 Jun 2012 17:25:23 +0000 (20:25 +0300)]
Up to 2.6

12 years agoadmin area -> search for users
randx [Thu, 21 Jun 2012 16:05:09 +0000 (19:05 +0300)]
admin area -> search for users

12 years agoadmin area -> search for projecs
randx [Thu, 21 Jun 2012 15:54:57 +0000 (18:54 +0300)]
admin area -> search for projecs

12 years agoPushed widget improved
randx [Thu, 21 Jun 2012 15:41:22 +0000 (18:41 +0300)]
Pushed widget improved

12 years agoresque auth example
randx [Thu, 21 Jun 2012 14:23:51 +0000 (17:23 +0300)]
resque auth example

12 years agoFew minor css improvements
randx [Thu, 21 Jun 2012 14:23:25 +0000 (17:23 +0300)]
Few minor css improvements

12 years agoBackgrounds for Issues
randx [Thu, 21 Jun 2012 13:43:40 +0000 (16:43 +0300)]
Backgrounds for Issues

12 years agoIssues & MR legend
Dmitriy Zaporozhets [Thu, 21 Jun 2012 05:29:53 +0000 (08:29 +0300)]
Issues & MR legend

12 years agolets comment browse feature
randx [Thu, 21 Jun 2012 06:58:05 +0000 (09:58 +0300)]
lets comment browse feature

12 years agoremove double negative
Zevs [Wed, 20 Jun 2012 21:21:13 +0000 (00:21 +0300)]
remove double negative

12 years agoMerge pull request #952 from gitlabhq/remove_link_to_function
Dmitriy Zaporozhets [Wed, 20 Jun 2012 20:09:33 +0000 (13:09 -0700)]
Merge pull request #952 from gitlabhq/remove_link_to_function

Get rid of deprecated link_to_function

12 years agomissed ;
randx [Wed, 20 Jun 2012 20:08:10 +0000 (23:08 +0300)]
missed ;

12 years agoGet rid of deprecated link_to_function
randx [Wed, 20 Jun 2012 18:29:55 +0000 (21:29 +0300)]
Get rid of deprecated link_to_function

12 years agoRevert "Handle Commit "show suppressed diff" link with a doc-ready event handler."
Zevs [Wed, 20 Jun 2012 18:01:27 +0000 (21:01 +0300)]
Revert "Handle Commit "show suppressed diff" link with a doc-ready event handler."

This reverts commit ef1598b4afa94b21db7f38755182a701d03ae44a.

12 years agoRevert "Handle MR "show all commits" link with a doc-ready event handler."
Zevs [Wed, 20 Jun 2012 18:01:00 +0000 (21:01 +0300)]
Revert "Handle MR "show all commits" link with a doc-ready event handler."

This reverts commit 5b1ede628065ecfdf95552322328b5bb7613753a.

12 years agoRevert "Invert "unless .empty?" to "if .present?"; unless-else is evil."
Zevs [Wed, 20 Jun 2012 18:00:34 +0000 (21:00 +0300)]
Revert "Invert "unless .empty?" to "if .present?"; unless-else is evil."

This reverts commit 7484bcfff7fc8e132d94701b3af47f521ce117c5.

12 years agoMerge pull request #951 from robbkidd/remove_link_to_function
Valeriy Sizov [Wed, 20 Jun 2012 17:43:32 +0000 (10:43 -0700)]
Merge pull request #951 from robbkidd/remove_link_to_function

Replace calls to deprecated link_to_function with doc-ready functions.

12 years agoHande error with huge commits
randx [Wed, 20 Jun 2012 17:08:18 +0000 (20:08 +0300)]
Hande error with huge commits

12 years agoMerge pull request #950 from netdata/Create_link_from_keys_count
Dmitriy Zaporozhets [Wed, 20 Jun 2012 15:29:05 +0000 (08:29 -0700)]
Merge pull request #950 from netdata/Create_link_from_keys_count

make a hyperlink from the counted keys

12 years agomake a hyperlink from the counted keys
Wouter D'Haeseleer [Wed, 20 Jun 2012 15:16:56 +0000 (17:16 +0200)]
make a hyperlink from the counted keys

Refs Ticket #948

12 years agoHandle Commit "show suppressed diff" link with a doc-ready event handler.
Robb Kidd [Wed, 20 Jun 2012 15:11:17 +0000 (11:11 -0400)]
Handle Commit "show suppressed diff" link with a doc-ready event handler.

Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.

12 years agoUpdate pygments version
Dmitriy Zaporozhets [Wed, 20 Jun 2012 10:45:26 +0000 (13:45 +0300)]
Update pygments version

12 years agoMerge pull request #947 from netdata/Update_gemfile_for_latest_grit
Dmitriy Zaporozhets [Wed, 20 Jun 2012 09:35:02 +0000 (02:35 -0700)]
Merge pull request #947 from netdata/Update_gemfile_for_latest_grit

Update to the latest grit

12 years agoUpdate Gemfile.lock as well
Wouter D'Haeseleer [Wed, 20 Jun 2012 09:14:41 +0000 (11:14 +0200)]
Update Gemfile.lock as well

12 years agoUpdate to the latst grit
Wouter D'Haeseleer [Tue, 19 Jun 2012 20:24:07 +0000 (22:24 +0200)]
Update to the latst grit

The latest grit includes a patch for performance improvements.

12 years agoMerge pull request #942 from veprbl/network_graph_fix
Dmitriy Zaporozhets [Tue, 19 Jun 2012 13:55:26 +0000 (06:55 -0700)]
Merge pull request #942 from veprbl/network_graph_fix

Network graph fix (#909)

12 years agonetwork graph: fixed minor visual artefacts
Dmitry Kalinkin [Tue, 19 Jun 2012 12:15:13 +0000 (16:15 +0400)]
network graph: fixed minor visual artefacts

12 years agonetwork graph: use same color for all branch
Dmitry Kalinkin [Tue, 19 Jun 2012 11:55:59 +0000 (15:55 +0400)]
network graph: use same color for all branch

12 years agonetwork graph: change lines to be more github-like (removes some ambiguousness in...
Dmitry Kalinkin [Tue, 19 Jun 2012 11:51:54 +0000 (15:51 +0400)]
network graph: change lines to be more github-like (removes some ambiguousness in graph presentation)

12 years agosmall refactoring for branch-graph.js
Dmitry Kalinkin [Fri, 15 Jun 2012 14:38:30 +0000 (18:38 +0400)]
small refactoring for branch-graph.js

12 years ago#909 fix network graph json generation
Dmitry Kalinkin [Fri, 15 Jun 2012 14:37:59 +0000 (18:37 +0400)]
#909 fix network graph json generation

12 years agoMerge pull request #940 from anoldguy/master
Dmitriy Zaporozhets [Tue, 19 Jun 2012 11:01:52 +0000 (04:01 -0700)]
Merge pull request #940 from anoldguy/master

Update Fonts to include good Windows Default monospaced font, too.

12 years agoIncluded good default font for Windows.
Nathan Anderson [Tue, 19 Jun 2012 10:56:09 +0000 (07:56 -0300)]
Included good default font for Windows.

12 years agoIncluded good default for Windows and standardized <pre> font families
Nathan Anderson [Tue, 19 Jun 2012 10:55:01 +0000 (07:55 -0300)]
Included good default for Windows and standardized <pre> font families

12 years agoBetter fonts for code
Dmitriy Zaporozhets [Tue, 19 Jun 2012 10:48:39 +0000 (13:48 +0300)]
Better fonts for code

12 years agoMerge pull request #937 from jdamick/master
Valeriy Sizov [Tue, 19 Jun 2012 08:40:01 +0000 (01:40 -0700)]
Merge pull request #937 from jdamick/master

Modified the login screen for primarily LDAP authentication

12 years agoHandle MR "show all commits" link with a doc-ready event handler.
Robb Kidd [Mon, 18 Jun 2012 22:36:25 +0000 (18:36 -0400)]
Handle MR "show all commits" link with a doc-ready event handler.

Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.

12 years agoInvert "unless .empty?" to "if .present?"; unless-else is evil.
Robb Kidd [Mon, 18 Jun 2012 21:52:16 +0000 (17:52 -0400)]
Invert "unless .empty?" to "if .present?"; unless-else is evil.

12 years agoAssignee filter for issues
randx [Mon, 18 Jun 2012 17:50:06 +0000 (20:50 +0300)]
Assignee filter for issues

12 years agoRefactor code themes
randx [Mon, 18 Jun 2012 17:18:14 +0000 (20:18 +0300)]
Refactor code themes

12 years agoCucumber features: Team, SSH keys
randx [Mon, 18 Jun 2012 16:34:09 +0000 (19:34 +0300)]
Cucumber features: Team, SSH keys

12 years agoremoved dead code from the form
jdamick [Mon, 18 Jun 2012 15:51:17 +0000 (11:51 -0400)]
removed dead code from the form

12 years agoMerge branch 'master' of github.com:jdamick/gitlabhq
jdamick [Mon, 18 Jun 2012 15:48:18 +0000 (11:48 -0400)]
Merge branch 'master' of github.com:jdamick/gitlabhq

12 years agomoved the ldap login to its own partial and cleaned up the forms a little bit
jdamick [Mon, 18 Jun 2012 15:40:14 +0000 (11:40 -0400)]
moved the ldap login to its own partial and cleaned up the forms a little bit

12 years agocustomizing the user login screen for primarily ldap authentication
jdamick [Fri, 15 Jun 2012 21:07:53 +0000 (17:07 -0400)]
customizing the user login screen for primarily ldap authentication

12 years agomoved the ldap login to its own partial and cleaned up the forms a little bit
jdamick [Mon, 18 Jun 2012 15:40:14 +0000 (11:40 -0400)]
moved the ldap login to its own partial and cleaned up the forms a little bit

12 years agoTest only 1.9.3 on travis
randx [Sun, 17 Jun 2012 20:05:33 +0000 (23:05 +0300)]
Test only 1.9.3 on travis

12 years agoInstall charlock for travis
randx [Sun, 17 Jun 2012 19:53:40 +0000 (22:53 +0300)]
Install charlock for travis

12 years agoImprove gitlab encode method
randx [Sun, 17 Jun 2012 19:00:13 +0000 (22:00 +0300)]
Improve gitlab encode method

12 years agono pending cucumber for travis
randx [Sun, 17 Jun 2012 16:19:01 +0000 (19:19 +0300)]
no pending cucumber for travis

12 years agoLets change how cucumber run on travis
randx [Sun, 17 Jun 2012 15:40:00 +0000 (18:40 +0300)]
Lets change how cucumber run on travis

12 years agoFix travis
randx [Sun, 17 Jun 2012 15:33:13 +0000 (18:33 +0300)]
Fix travis

12 years agoMerge pull request #932 from gitlabhq/cucumber
Dmitriy Zaporozhets [Sat, 16 Jun 2012 10:46:14 +0000 (03:46 -0700)]
Merge pull request #932 from gitlabhq/cucumber

Cucumber

12 years agoKeep network graph pending
randx [Sat, 16 Jun 2012 10:45:51 +0000 (13:45 +0300)]
Keep network graph pending

12 years agofixed type
randx [Sat, 16 Jun 2012 10:31:21 +0000 (13:31 +0300)]
fixed type

12 years agofix ci run
randx [Sat, 16 Jun 2012 10:20:17 +0000 (13:20 +0300)]
fix ci run

12 years agoCucumber -> Network graph feature
randx [Sat, 16 Jun 2012 10:03:20 +0000 (13:03 +0300)]
Cucumber -> Network graph feature

12 years agoCucumber -> Dashboard features
randx [Sat, 16 Jun 2012 09:50:14 +0000 (12:50 +0300)]
Cucumber -> Dashboard features

12 years agocustomizing the user login screen for primarily ldap authentication
jdamick [Fri, 15 Jun 2012 21:07:53 +0000 (17:07 -0400)]
customizing the user login screen for primarily ldap authentication

12 years agotravis updated
randx [Fri, 15 Jun 2012 16:01:39 +0000 (19:01 +0300)]
travis updated

12 years agoMerge pull request #931 from goshakkk/comments-anchors
Dmitriy Zaporozhets [Fri, 15 Jun 2012 15:54:55 +0000 (08:54 -0700)]
Merge pull request #931 from goshakkk/comments-anchors

Add HTML anchors for comments

12 years agoAdd HTML anchors for comments #929
Gosha Arinich [Fri, 15 Jun 2012 15:53:00 +0000 (18:53 +0300)]
Add HTML anchors for comments #929

12 years agoMerge pull request #930 from benphelps/patch-1
Valeriy Sizov [Fri, 15 Jun 2012 06:37:07 +0000 (23:37 -0700)]
Merge pull request #930 from benphelps/patch-1

Fix typo in wiki page last edited message.

12 years agoCucumber:
Dmitriy Zaporozhets [Fri, 15 Jun 2012 04:15:28 +0000 (07:15 +0300)]
Cucumber:
* Profile
* Browse code
* Sceleton for main features
* Wiki
* Commits

12 years agoChange "in" to "ago" in last edited message.
Ben Phelps [Fri, 15 Jun 2012 01:51:01 +0000 (20:51 -0500)]
Change "in" to "ago" in last edited message.

12 years agomailObserver quickfix
Dmitriy Zaporozhets [Thu, 14 Jun 2012 09:45:22 +0000 (12:45 +0300)]
mailObserver quickfix

12 years agorefactored mail observer
Dmitriy Zaporozhets [Thu, 14 Jun 2012 05:24:10 +0000 (08:24 +0300)]
refactored mail observer

12 years agoFew css fixes for dark theme
Dmitriy Zaporozhets [Thu, 14 Jun 2012 07:43:35 +0000 (10:43 +0300)]
Few css fixes for dark theme

12 years agoCSS refactoring
randx [Wed, 13 Jun 2012 17:02:30 +0000 (20:02 +0300)]
CSS refactoring

12 years agoMerge pull request #923 from NARKOZ/refactoring-2
Dmitriy Zaporozhets [Wed, 13 Jun 2012 12:44:58 +0000 (05:44 -0700)]
Merge pull request #923 from NARKOZ/refactoring-2

Minor cleanup

12 years agofix broken spec
Nihad Abbasov [Wed, 13 Jun 2012 12:36:51 +0000 (05:36 -0700)]
fix broken spec

12 years agoremove useless index method from projects controller
Nihad Abbasov [Wed, 13 Jun 2012 12:22:40 +0000 (05:22 -0700)]
remove useless index method from projects controller

see edd81a79c5c2a61e565664cfa787185c4e19729b

12 years agono need to extend assets path anymore
Nihad Abbasov [Wed, 13 Jun 2012 12:19:02 +0000 (05:19 -0700)]
no need to extend assets path anymore

see 865cf830c482b120aad70d40ebee595901899b1c

12 years agoRefactored project archive. Improved MR usability form
Dmitriy Zaporozhets [Wed, 13 Jun 2012 06:03:53 +0000 (09:03 +0300)]
Refactored project archive. Improved MR usability form

12 years agoDashboard refactoring:
randx [Tue, 12 Jun 2012 20:13:42 +0000 (23:13 +0300)]
Dashboard refactoring:
* dashboard should be in dashboard controller not project index
* projects index removed

12 years agoBetter UI for projects list on dahboard
randx [Tue, 12 Jun 2012 19:04:57 +0000 (22:04 +0300)]
Better UI for projects list on dahboard

12 years agoui-box style improved
randx [Tue, 12 Jun 2012 18:55:10 +0000 (21:55 +0300)]
ui-box style improved

12 years agoStyled snippets. Raw button for snippet
randx [Tue, 12 Jun 2012 18:41:46 +0000 (21:41 +0300)]
Styled snippets. Raw button for snippet

12 years agoSpecs for last push widget
randx [Tue, 12 Jun 2012 18:15:34 +0000 (21:15 +0300)]
Specs for last push widget

12 years agoRecent push event
Dmitriy Zaporozhets [Tue, 12 Jun 2012 14:43:16 +0000 (17:43 +0300)]
Recent push event

12 years agofew improvements for ui
Dmitriy Zaporozhets [Tue, 12 Jun 2012 13:36:27 +0000 (16:36 +0300)]
few improvements for ui

12 years agoCSS refactored
Dmitriy Zaporozhets [Tue, 12 Jun 2012 11:58:44 +0000 (14:58 +0300)]
CSS refactored

12 years agoRefactored IssuesController
Dmitriy Zaporozhets [Tue, 12 Jun 2012 08:31:38 +0000 (11:31 +0300)]
Refactored IssuesController

12 years agoMerge pull request #917 from teaminsight/queue_fix
Dmitriy Zaporozhets [Mon, 11 Jun 2012 21:04:33 +0000 (14:04 -0700)]
Merge pull request #917 from teaminsight/queue_fix

Connection fix for resque worker

12 years agoadded connection fix initializer, helps long running resque workers not fail
jcredding [Mon, 11 Jun 2012 20:06:17 +0000 (15:06 -0500)]
added connection fix initializer, helps long running resque workers not fail

12 years agoRefactored theme css, added Modern theme pre version
randx [Mon, 11 Jun 2012 17:52:32 +0000 (20:52 +0300)]
Refactored theme css, added Modern theme pre version

12 years agoGet rid of modularity gem, Styled 'nothing here' message
Dmitriy Zaporozhets [Mon, 11 Jun 2012 05:52:44 +0000 (08:52 +0300)]
Get rid of modularity gem, Styled 'nothing here' message

12 years agoMerge pull request #916 from mvrhov/patch-1
Valeriy Sizov [Mon, 11 Jun 2012 10:46:04 +0000 (03:46 -0700)]
Merge pull request #916 from mvrhov/patch-1

Add missing libyaml-dev to debian install script

12 years agoAdd missing libyaml-dev
Miha Vrhovnik [Mon, 11 Jun 2012 07:43:57 +0000 (10:43 +0300)]
Add missing libyaml-dev

12 years agoMerge pull request #914 from oreofish/betterqueue
Valeriy Sizov [Sun, 10 Jun 2012 18:40:53 +0000 (11:40 -0700)]
Merge pull request #914 from oreofish/betterqueue

only address resque works in post_receive and mailer queue

12 years agoonly address resque works in post_receive and mailer queue
RickXing [Sun, 10 Jun 2012 09:11:34 +0000 (17:11 +0800)]
only address resque works in post_receive and mailer queue

12 years agoMerge pull request #908 from avakarev/update-rails-to-3.2.5
Dmitriy Zaporozhets [Sun, 10 Jun 2012 08:36:41 +0000 (01:36 -0700)]
Merge pull request #908 from avakarev/update-rails-to-3.2.5

Update rails version to 3.2.5

12 years agoMerge pull request #904 from gitlabhq/models_refactoring
Dmitriy Zaporozhets [Sun, 10 Jun 2012 08:25:53 +0000 (01:25 -0700)]
Merge pull request #904 from gitlabhq/models_refactoring

Models Refactoring: Move methods to roles

12 years agoMerge pull request #911 from JamesEarlDouglas/master
Valeriy Sizov [Sat, 9 Jun 2012 08:15:02 +0000 (01:15 -0700)]
Merge pull request #911 from JamesEarlDouglas/master

Fix a minor typo in example configuration file