OSDN Git Service

wvm/gitlab.git
11 years agoMerge pull request #2222 from jojosch/add-test-help-raketasks
Riyad Preukschas [Mon, 10 Dec 2012 13:38:14 +0000 (05:38 -0800)]
Merge pull request #2222 from jojosch/add-test-help-raketasks

add help/raketasks to routing spec and search autocomplete

11 years agoMerge pull request #2240 from koenpunt/patch-1
Riyad Preukschas [Mon, 10 Dec 2012 13:31:27 +0000 (05:31 -0800)]
Merge pull request #2240 from koenpunt/patch-1

Added link to support forum

11 years agoAdded link to support forum
Koen Punt [Mon, 10 Dec 2012 11:15:51 +0000 (12:15 +0100)]
Added link to support forum

11 years agoMake admin sorting more obvious
Dmitriy Zaporozhets [Mon, 10 Dec 2012 03:14:05 +0000 (06:14 +0300)]
Make admin sorting more obvious

11 years agoFix spelling and wording in installation.md
Riyad Preukschas [Mon, 10 Dec 2012 00:08:34 +0000 (01:08 +0100)]
Fix spelling and wording in installation.md

11 years agoFix installatiion doc
Dmitriy Zaporozhets [Sun, 9 Dec 2012 14:05:24 +0000 (16:05 +0200)]
Fix installatiion doc

11 years agoReplace project with namespace for events
Dmitriy Zaporozhets [Sun, 9 Dec 2012 14:03:24 +0000 (16:03 +0200)]
Replace project with namespace for events

11 years agoShow project with namespace in feeds
Dmitriy Zaporozhets [Sun, 9 Dec 2012 08:56:15 +0000 (10:56 +0200)]
Show project with namespace in feeds

11 years agoFix worker specs to parse namespaces
Dmitriy Zaporozhets [Sun, 9 Dec 2012 08:34:46 +0000 (10:34 +0200)]
Fix worker specs to parse namespaces

11 years agoFix project lookup in post receive
Dmitriy Zaporozhets [Sat, 8 Dec 2012 18:48:33 +0000 (20:48 +0200)]
Fix project lookup in post receive

11 years agoadd help raketasks to search autocomplete
Johannes Schleifenbaum [Sat, 8 Dec 2012 16:34:24 +0000 (17:34 +0100)]
add help raketasks to search autocomplete

11 years agoadd help/raketasks to routing spec
Johannes Schleifenbaum [Sat, 8 Dec 2012 10:42:38 +0000 (11:42 +0100)]
add help/raketasks to routing spec

11 years agoMerge pull request #2215 from jojosch/fix-notify-notes
Dmitriy Zaporozhets [Fri, 7 Dec 2012 20:52:22 +0000 (12:52 -0800)]
Merge pull request #2215 from jojosch/fix-notify-notes

fix notify_team on wall

11 years agoMerge pull request #2188 from riyad/update-installation-docs
Dmitriy Zaporozhets [Fri, 7 Dec 2012 20:43:25 +0000 (12:43 -0800)]
Merge pull request #2188 from riyad/update-installation-docs

Update installation docs

11 years agofix notify_team on wall
Johannes Schleifenbaum [Fri, 7 Dec 2012 13:55:56 +0000 (14:55 +0100)]
fix notify_team on wall

11 years agoAdd instructions for dealing with the Python 2 vs 3 mess
Riyad Preukschas [Fri, 7 Dec 2012 16:32:38 +0000 (17:32 +0100)]
Add instructions for dealing with the Python 2 vs 3 mess

11 years agoAdd checking installtion with gitlab:env:info task
Riyad Preukschas [Fri, 7 Dec 2012 16:28:47 +0000 (17:28 +0100)]
Add checking installtion with gitlab:env:info task

11 years agoMake sure the user edits gitlab.yml
Riyad Preukschas [Fri, 7 Dec 2012 16:28:05 +0000 (17:28 +0100)]
Make sure the user edits gitlab.yml

11 years agoMake gitlab:env:info task more robust
Riyad Preukschas [Fri, 7 Dec 2012 15:42:09 +0000 (16:42 +0100)]
Make gitlab:env:info task more robust

Closes #2213

11 years agoDont show remove project button if you have no permission
Dmitriy Zaporozhets [Fri, 7 Dec 2012 13:53:04 +0000 (15:53 +0200)]
Dont show remove project button if you have no permission

11 years agoMerge pull request #2202 from gitlabhq/ui/tiny_nav
Ariejan de Vroom [Fri, 7 Dec 2012 09:35:48 +0000 (01:35 -0800)]
Merge pull request #2202 from gitlabhq/ui/tiny_nav

Redesign for navigation bar.

11 years agoMerge pull request #2208 from jouve/username2
Ariejan de Vroom [Fri, 7 Dec 2012 09:30:36 +0000 (01:30 -0800)]
Merge pull request #2208 from jouve/username2

Allow proper use of @username in Git(lab|hub) Flavored Markdown.

11 years agoMerge pull request #2007 from Partugal/patch-custom-gravatar
Ariejan de Vroom [Fri, 7 Dec 2012 09:19:25 +0000 (01:19 -0800)]
Merge pull request #2007 from Partugal/patch-custom-gravatar

Allow using a custom Gravatar URL.

Default is still set to the Gravatar.com service, but allows override
for a custom gravatar-ish service.

11 years agoreplace user.name by user.username in GFM
Cyril [Fri, 7 Dec 2012 03:40:42 +0000 (04:40 +0100)]
replace user.name by user.username in GFM

11 years agoallow customize gravatar url
Sergey Linnik [Thu, 6 Dec 2012 20:44:22 +0000 (00:44 +0400)]
allow customize gravatar url

11 years agoImprove gitlab:env:info task
Riyad Preukschas [Thu, 6 Dec 2012 20:16:48 +0000 (21:16 +0100)]
Improve gitlab:env:info task

Renamed from gitlab:app:info
Add several extra info points

11 years agofix some glitches in gravatar image url generation
Sergey Linnik [Sun, 18 Nov 2012 22:36:50 +0000 (02:36 +0400)]
fix some glitches in gravatar image url generation

always use proper size value
do not show alt text when avatar image not loaded

11 years agoMerge pull request #2205 from Partugal/patch-fix-spec
Riyad Preukschas [Thu, 6 Dec 2012 20:00:45 +0000 (12:00 -0800)]
Merge pull request #2205 from Partugal/patch-fix-spec

fix failing spec

11 years agofix failing spec
Sergey Linnik [Thu, 6 Dec 2012 19:38:38 +0000 (23:38 +0400)]
fix failing spec

11 years agoMerge pull request #2204 from cdawzrd/patch-1
Riyad Preukschas [Thu, 6 Dec 2012 19:24:23 +0000 (11:24 -0800)]
Merge pull request #2204 from cdawzrd/patch-1

Spelling fix to rake info task

11 years agoSpelling fix to rake info task
Jon Evans [Thu, 6 Dec 2012 19:10:42 +0000 (14:10 -0500)]
Spelling fix to rake info task

11 years agoMerge pull request #2194 from jojosch/rake-info-task
Riyad Preukschas [Thu, 6 Dec 2012 15:39:42 +0000 (07:39 -0800)]
Merge pull request #2194 from jojosch/rake-info-task

add rake task to gather system information

11 years agoTiny nav
Dmitriy Zaporozhets [Thu, 6 Dec 2012 14:54:53 +0000 (16:54 +0200)]
Tiny nav

11 years agoUpdate jquery-atwho-rails gem
Riyad Preukschas [Thu, 6 Dec 2012 14:42:08 +0000 (15:42 +0100)]
Update jquery-atwho-rails gem

Fixes #1860

11 years agoFix broken styling after #2176
Riyad Preukschas [Thu, 6 Dec 2012 10:08:51 +0000 (11:08 +0100)]
Fix broken styling after #2176

Closes #2196

11 years agoadd rake task to gather system information
Johannes Schleifenbaum [Wed, 5 Dec 2012 17:27:54 +0000 (18:27 +0100)]
add rake task to gather system information

11 years agoAdd more indexes (see #2159)
Riyad Preukschas [Wed, 5 Dec 2012 20:50:20 +0000 (21:50 +0100)]
Add more indexes (see #2159)

11 years agoUpdate installation guide
Riyad Preukschas [Wed, 5 Dec 2012 19:34:11 +0000 (20:34 +0100)]
Update installation guide

11 years agoUpdate hardware and platform requirements guide
Riyad Preukschas [Wed, 5 Dec 2012 18:31:08 +0000 (19:31 +0100)]
Update hardware and platform requirements guide

11 years agoConsistently use sudo -u foo -H
Riyad Preukschas [Wed, 5 Dec 2012 17:21:28 +0000 (18:21 +0100)]
Consistently use sudo -u foo -H

11 years agoRemove redundant packages and move database specific ones to the db setup
Riyad Preukschas [Wed, 5 Dec 2012 17:18:09 +0000 (18:18 +0100)]
Remove redundant packages and move database specific ones to the db setup

* build-essential requires make, gcc
* remove libmysql++-dev: the mysql2 gem only requires libmysqlclient-dev
* remove postgresql-server-dev-9.1: the pg gem only requires libpq-dev
* replace python-dev, python-pip with python2.7: the pygments.rb gem only requires python2.7

11 years agoUpdate database setup instructions to be more consistent
Riyad Preukschas [Wed, 5 Dec 2012 16:53:24 +0000 (17:53 +0100)]
Update database setup instructions to be more consistent

11 years agoRemove generic database.yml.example
Riyad Preukschas [Wed, 5 Dec 2012 16:38:54 +0000 (17:38 +0100)]
Remove generic database.yml.example

11 years agoMake profile dropbown a bit bigger
Dmitriy Zaporozhets [Wed, 5 Dec 2012 15:08:24 +0000 (17:08 +0200)]
Make profile dropbown a bit bigger

11 years agoRewrite project security model tests
Dmitriy Zaporozhets [Wed, 5 Dec 2012 15:06:15 +0000 (17:06 +0200)]
Rewrite project security model tests

11 years agoFix 500 error on services page. Fixed active project tab when on services
Dmitriy Zaporozhets [Wed, 5 Dec 2012 12:17:40 +0000 (14:17 +0200)]
Fix 500 error on services page. Fixed active project tab when on services

11 years agoOnly owner can remove project
Dmitriy Zaporozhets [Wed, 5 Dec 2012 03:14:05 +0000 (06:14 +0300)]
Only owner can remove project

11 years agoRestyled services page in order to make it more usable
Dmitriy Zaporozhets [Sun, 2 Dec 2012 05:41:06 +0000 (08:41 +0300)]
Restyled services page in order to make it more usable

11 years agoMerge pull request #2177 from riyad/update-pygments.rb
Dmitriy Zaporozhets [Wed, 5 Dec 2012 10:45:22 +0000 (02:45 -0800)]
Merge pull request #2177 from riyad/update-pygments.rb

Update pygments.rb

11 years agoUpdate pygments.rb
Riyad Preukschas [Wed, 5 Dec 2012 01:14:08 +0000 (02:14 +0100)]
Update pygments.rb

Fixes #1774

11 years agoMerge pull request #2176 from koenpunt/gh-issue-1612
Riyad Preukschas [Wed, 5 Dec 2012 00:40:08 +0000 (16:40 -0800)]
Merge pull request #2176 from koenpunt/gh-issue-1612

Fix for #1612 `overflow: auto` so content won't break layout

11 years agooverflow: auto so content won't break layout #1612
Koen Punt [Wed, 5 Dec 2012 00:19:58 +0000 (01:19 +0100)]
overflow: auto so content won't break layout #1612

11 years agoAdmin can move project to ANY namespace. Updated permissions page
Dmitriy Zaporozhets [Tue, 4 Dec 2012 20:48:24 +0000 (22:48 +0200)]
Admin can move project to ANY namespace. Updated permissions page

11 years agoOnly owner of current namespace can change project namespace
Dmitriy Zaporozhets [Tue, 4 Dec 2012 20:06:55 +0000 (22:06 +0200)]
Only owner of current namespace can change project namespace

11 years agoMerge pull request #2172 from skarphet/patch-1
Riyad Preukschas [Tue, 4 Dec 2012 19:17:56 +0000 (11:17 -0800)]
Merge pull request #2172 from skarphet/patch-1

Devise locale updated to stay consistent with GitLab

11 years agoDevise locale updated to stay consistent with GitLab
skarphet [Tue, 4 Dec 2012 18:19:26 +0000 (19:19 +0100)]
Devise locale updated to stay consistent with GitLab

11 years agoShow namespaces when adding projects to user in admin area
Dmitriy Zaporozhets [Tue, 4 Dec 2012 13:26:12 +0000 (15:26 +0200)]
Show namespaces when adding projects to user in admin area

11 years agoDont allow select block user as new team member
Dmitriy Zaporozhets [Tue, 4 Dec 2012 13:22:22 +0000 (15:22 +0200)]
Dont allow select block user as new team member

11 years agoRemove some bugs. Add warnings for renaming group. Add ability to cahnge group owner.
Dmitriy Zaporozhets [Mon, 3 Dec 2012 18:14:05 +0000 (21:14 +0300)]
Remove some bugs. Add warnings for renaming group. Add ability to cahnge group owner.

11 years agoFix bug getting started message when navigate to personal projects w/o them exist
Dmitriy Zaporozhets [Tue, 4 Dec 2012 09:18:13 +0000 (11:18 +0200)]
Fix bug getting started message when navigate to personal projects w/o them exist

11 years agoupdate link to travis-ci
Nihad Abbasov [Tue, 4 Dec 2012 08:39:09 +0000 (12:39 +0400)]
update link to travis-ci

11 years agoMerge pull request #2149 from jojosch/help-rake-tasks
Dmitriy Zaporozhets [Mon, 3 Dec 2012 17:07:37 +0000 (09:07 -0800)]
Merge pull request #2149 from jojosch/help-rake-tasks

add help page for gitlab specific rake tasks

11 years agoadd help page for gitlab specific rake tasks
Johannes Schleifenbaum [Sun, 2 Dec 2012 12:56:04 +0000 (13:56 +0100)]
add help page for gitlab specific rake tasks

11 years agoMore indices for asscociations. related to #2159
Dmitriy Zaporozhets [Mon, 3 Dec 2012 16:11:47 +0000 (18:11 +0200)]
More indices for asscociations. related to #2159

11 years agoEvent indices related to #2159
Dmitriy Zaporozhets [Mon, 3 Dec 2012 15:50:33 +0000 (17:50 +0200)]
Event indices related to #2159

11 years agoRemove annoying failing spec
Dmitriy Zaporozhets [Mon, 3 Dec 2012 15:38:35 +0000 (17:38 +0200)]
Remove annoying failing spec

11 years agoFix broken CSS
Dmitriy Zaporozhets [Mon, 3 Dec 2012 12:39:13 +0000 (14:39 +0200)]
Fix broken CSS

11 years agoRemove unsued css styles. Fixed Milestone preselected date.
Dmitriy Zaporozhets [Sat, 1 Dec 2012 06:14:05 +0000 (09:14 +0300)]
Remove unsued css styles. Fixed Milestone preselected date.

11 years agoFix github issue #967
Dmitriy Zaporozhets [Mon, 3 Dec 2012 11:22:28 +0000 (13:22 +0200)]
Fix github issue #967

11 years agoAdd description to project features on edit project page
Dmitriy Zaporozhets [Sun, 2 Dec 2012 17:28:23 +0000 (19:28 +0200)]
Add description to project features on edit project page

11 years agoMerge pull request #2124 from NARKOZ/api
Dmitriy Zaporozhets [Sun, 2 Dec 2012 11:30:30 +0000 (03:30 -0800)]
Merge pull request #2124 from NARKOZ/api

remove unnecessary API::VERSION constant

11 years agoRefactored profile to resource. Added missing flash notice on successfull updated...
Dmitriy Zaporozhets [Sun, 2 Dec 2012 11:29:24 +0000 (13:29 +0200)]
Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sun, 2 Dec 2012 10:18:48 +0000 (12:18 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agoMerge pull request #2138 from jouve/refactor_flash
Dmitriy Zaporozhets [Sun, 2 Dec 2012 10:18:34 +0000 (02:18 -0800)]
Merge pull request #2138 from jouve/refactor_flash

refactor flash

11 years agoMerge pull request #2148 from jojosch/fix-2147
Valeriy Sizov [Sat, 1 Dec 2012 22:02:53 +0000 (14:02 -0800)]
Merge pull request #2148 from jojosch/fix-2147

commit diff - check if prev_commit is not nil

11 years agocommit diff - check if prev_commit is not nil
Johannes Schleifenbaum [Sat, 1 Dec 2012 18:31:39 +0000 (19:31 +0100)]
commit diff - check if prev_commit is not nil

11 years agoMerge pull request #2141 from NARKOZ/notes-text-limit
Dmitriy Zaporozhets [Sat, 1 Dec 2012 18:30:10 +0000 (10:30 -0800)]
Merge pull request #2141 from NARKOZ/notes-text-limit

remove length limit from notes

11 years agorefactor flash
Cyril [Thu, 29 Nov 2012 21:51:51 +0000 (22:51 +0100)]
refactor flash
* make unobtrusive js
* convert js to coffee

11 years agoremove length limit from notes
Nihad Abbasov [Sat, 1 Dec 2012 11:19:16 +0000 (03:19 -0800)]
remove length limit from notes

11 years agoAPI: get a single wall note
Nihad Abbasov [Sat, 1 Dec 2012 10:20:45 +0000 (02:20 -0800)]
API: get a single wall note

11 years agoupdate contents of API README
Nihad Abbasov [Sat, 1 Dec 2012 10:07:57 +0000 (02:07 -0800)]
update contents of API README

11 years agoAPI: expose created date for project hooks and user SSH keys
Nihad Abbasov [Thu, 29 Nov 2012 22:59:56 +0000 (14:59 -0800)]
API: expose created date for project hooks and user SSH keys

11 years agoAPI version returns last version set
Nihad Abbasov [Thu, 29 Nov 2012 21:42:22 +0000 (13:42 -0800)]
API version returns last version set

  * fixed in grape v0.2.2

11 years agogitlab meta to 4.0
Dmitriy Zaporozhets [Fri, 30 Nov 2012 21:08:08 +0000 (23:08 +0200)]
gitlab meta to 4.0

11 years agoMerge pull request #2059 from dolanor/feature-rewording-blocked-users
Dmitriy Zaporozhets [Fri, 30 Nov 2012 20:50:06 +0000 (12:50 -0800)]
Merge pull request #2059 from dolanor/feature-rewording-blocked-users

Rewording for the account being blocked

11 years agoMerge pull request #2017 from duksis/backup_restore
Dmitriy Zaporozhets [Fri, 30 Nov 2012 20:48:27 +0000 (12:48 -0800)]
Merge pull request #2017 from duksis/backup_restore

bugfix: backup data retrieved with the same type keys as saved

11 years agoAdded vendor/bundle to gitignore. Removed project js slugify
Dmitriy Zaporozhets [Fri, 30 Nov 2012 17:49:51 +0000 (19:49 +0200)]
Added vendor/bundle to gitignore. Removed project js slugify

11 years agoUse project owner if no namespace. Restyled team page
Dmitriy Zaporozhets [Fri, 30 Nov 2012 16:26:17 +0000 (18:26 +0200)]
Use project owner if no namespace. Restyled team page

11 years agochange version to 4.0.0pre
Dmitriy Zaporozhets [Fri, 30 Nov 2012 14:47:04 +0000 (16:47 +0200)]
change version to 4.0.0pre

11 years agoFix MR comments
Dmitriy Zaporozhets [Fri, 30 Nov 2012 14:03:10 +0000 (16:03 +0200)]
Fix MR comments

11 years agoFilter projects on dashboard
Dmitriy Zaporozhets [Fri, 30 Nov 2012 03:14:05 +0000 (06:14 +0300)]
Filter projects on dashboard

11 years agoMerge pull request #2119 from erroric/fix_issue2118
Valeriy Sizov [Fri, 30 Nov 2012 09:19:29 +0000 (01:19 -0800)]
Merge pull request #2119 from erroric/fix_issue2118

issue #2118: fix undefined method  for nil:NilClass exception

11 years agoMerge pull request #2127 from NARKOZ/notes-api
Valeriy Sizov [Fri, 30 Nov 2012 09:09:49 +0000 (01:09 -0800)]
Merge pull request #2127 from NARKOZ/notes-api

API: don't expose 'updated_at' for notes

11 years agoAPI: ability to create a wall note
Nihad Abbasov [Thu, 29 Nov 2012 23:52:56 +0000 (15:52 -0800)]
API: ability to create a wall note

11 years agoAPI: don't expose 'updated_at' for notes
Nihad Abbasov [Thu, 29 Nov 2012 22:41:24 +0000 (14:41 -0800)]
API: don't expose 'updated_at' for notes

11 years agofix label name
Nihad Abbasov [Thu, 29 Nov 2012 22:26:18 +0000 (14:26 -0800)]
fix label name

11 years agoMerge pull request #2123 from NARKOZ/notes-api
Dmitriy Zaporozhets [Thu, 29 Nov 2012 21:05:57 +0000 (13:05 -0800)]
Merge pull request #2123 from NARKOZ/notes-api

Notes API

11 years agoupdate CHANGELOG
Nihad Abbasov [Thu, 29 Nov 2012 20:35:16 +0000 (12:35 -0800)]
update CHANGELOG

11 years agoadd docs for notes API
Nihad Abbasov [Thu, 29 Nov 2012 20:32:05 +0000 (12:32 -0800)]
add docs for notes API

11 years agoAPI: restore broken merge request commenting
Nihad Abbasov [Thu, 29 Nov 2012 20:10:07 +0000 (12:10 -0800)]
API: restore broken merge request commenting