OSDN Git Service

wvm/gitlab.git
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

11 years agoAPI: create new notes
Nihad Abbasov [Thu, 29 Nov 2012 20:06:24 +0000 (12:06 -0800)]
API: create new notes

11 years agoAPI: get a single note
Nihad Abbasov [Thu, 29 Nov 2012 19:33:41 +0000 (11:33 -0800)]
API: get a single note

11 years agocorrect example
Nihad Abbasov [Thu, 29 Nov 2012 19:21:14 +0000 (11:21 -0800)]
correct example

11 years agoAPI: list wall, snippet and issue notes
Nihad Abbasov [Tue, 27 Nov 2012 19:43:39 +0000 (11:43 -0800)]
API: list wall, snippet and issue notes

11 years agoManage team from groups page. Phase 1
Dmitriy Zaporozhets [Thu, 29 Nov 2012 17:14:05 +0000 (20:14 +0300)]
Manage team from groups page. Phase 1

11 years agoMinor improvments to UI
Dmitriy Zaporozhets [Thu, 29 Nov 2012 16:09:27 +0000 (18:09 +0200)]
Minor improvments to UI

11 years agoissue #2118: fix undefined method for nil:NilClass exception
Alexey Loktionov [Thu, 29 Nov 2012 15:38:06 +0000 (19:38 +0400)]
issue #2118: fix undefined method  for nil:NilClass exception

11 years agoauthorized_projects and authorized_groups methods for user
Dmitriy Zaporozhets [Thu, 29 Nov 2012 15:17:01 +0000 (17:17 +0200)]
authorized_projects and authorized_groups methods for user

11 years agoMerge pull request #2117 from koenpunt/scss-cleanup
Dmitriy Zaporozhets [Thu, 29 Nov 2012 14:51:27 +0000 (06:51 -0800)]
Merge pull request #2117 from koenpunt/scss-cleanup

Scss cleanup

11 years agoFix group duplication on dashboard and project order in group
Dmitriy Zaporozhets [Thu, 29 Nov 2012 14:43:09 +0000 (16:43 +0200)]
Fix group duplication on dashboard and project order in group

11 years agoSelective responsive bootstrap
Koen Punt [Thu, 29 Nov 2012 14:37:28 +0000 (15:37 +0100)]
Selective responsive bootstrap

11 years agoMixins are now all with dashes instead of underscores
Koen Punt [Tue, 27 Nov 2012 23:30:26 +0000 (00:30 +0100)]
Mixins are now all with dashes instead of underscores
 (there really should be some convention for all gitlab css)

11 years agorenamed blue_link var to primary_color
Koen Punt [Sun, 25 Nov 2012 19:03:14 +0000 (20:03 +0100)]
renamed blue_link var to primary_color

11 years agoRemoved bg-gradient, now directly using linear-gradient
Koen Punt [Sun, 25 Nov 2012 18:25:33 +0000 (19:25 +0100)]
Removed bg-gradient, now directly using linear-gradient

11 years agoremoved overqualified mixins round-borders-*
Koen Punt [Sun, 25 Nov 2012 17:30:18 +0000 (18:30 +0100)]
removed overqualified mixins round-borders-*

11 years agoForgot to rename var
Koen Punt [Sat, 24 Nov 2012 09:57:22 +0000 (10:57 +0100)]
Forgot to rename var

11 years agoreplaced redundant -*-border-radius box-shadows and others with corresponding mixins
Koen Punt [Fri, 23 Nov 2012 16:51:38 +0000 (17:51 +0100)]
replaced redundant -*-border-radius box-shadows and others with corresponding mixins

11 years agoAdded some uniformity, all css properties and values are separated by a colon and...
Koen Punt [Fri, 23 Nov 2012 16:33:43 +0000 (17:33 +0100)]
Added some uniformity, all css properties and values are separated by a colon and a space `: `

11 years agoRemoved css declarations out of main.scss, so main is only a collector
Koen Punt [Fri, 23 Nov 2012 16:26:26 +0000 (17:26 +0100)]
Removed css declarations out of main.scss, so main is only a collector
Fonts, variables and mixins are now all in their own stylesheets

11 years agoRefactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces
Dmitriy Zaporozhets [Thu, 29 Nov 2012 04:29:11 +0000 (07:29 +0300)]
Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces

11 years agoMerge pull request #2096 from panxiaoming/master
Saito [Thu, 29 Nov 2012 10:02:22 +0000 (02:02 -0800)]
Merge pull request #2096 from panxiaoming/master

can't open a chinese file name doc

11 years agoMerge pull request #2105 from jouve/improve_admin_views
Dmitriy Zaporozhets [Thu, 29 Nov 2012 08:39:50 +0000 (00:39 -0800)]
Merge pull request #2105 from jouve/improve_admin_views

Improve admin section

11 years agoImprove admin logs
Dmitriy Zaporozhets [Thu, 29 Nov 2012 04:49:11 +0000 (07:49 +0300)]
Improve admin logs

11 years agoRemoved feature: comments on wiki
Dmitriy Zaporozhets [Thu, 29 Nov 2012 03:14:05 +0000 (06:14 +0300)]
Removed feature: comments on wiki

11 years agoMerge pull request #1655 from zzet/feature/resque_fix
Dmitriy Zaporozhets [Wed, 28 Nov 2012 18:35:32 +0000 (10:35 -0800)]
Merge pull request #1655 from zzet/feature/resque_fix

fix resque start

11 years agoMerge pull request #2107 from AlexDenisov/projects_count_at_dashboard
Dmitriy Zaporozhets [Wed, 28 Nov 2012 18:34:13 +0000 (10:34 -0800)]
Merge pull request #2107 from AlexDenisov/projects_count_at_dashboard

Projects count at dashboard

11 years agoauthorized_for scope added to project
Alex Denisov [Wed, 28 Nov 2012 18:09:13 +0000 (20:09 +0200)]
authorized_for scope added to project

11 years agoSpinach test added
Alex Denisov [Wed, 28 Nov 2012 17:59:19 +0000 (19:59 +0200)]
Spinach test added

11 years agoRestyled error messages in common way. Added title to head partial
Dmitriy Zaporozhets [Wed, 28 Nov 2012 17:40:54 +0000 (19:40 +0200)]
Restyled error messages in common way. Added title to head partial

11 years agoImprove admin views for project and groups
Cyril [Wed, 28 Nov 2012 16:08:25 +0000 (17:08 +0100)]
Improve admin views for project and groups
* layout: add 'Groups' item to main_menu
* admin/dashboard: add a ui-box for groups
* projects and groups: remove nav tabs

11 years agoMerge pull request #2103 from tsigo/issue_project_link_rebase
Dmitriy Zaporozhets [Wed, 28 Nov 2012 16:39:44 +0000 (08:39 -0800)]
Merge pull request #2103 from tsigo/issue_project_link_rebase

Add a link to each project on the Issues dashboard

11 years agoAdd a link to each project on the Issues dashboard
Robert Speicher [Tue, 20 Nov 2012 04:49:25 +0000 (23:49 -0500)]
Add a link to each project on the Issues dashboard

11 years agoFix GitLab Markdown helper spec
Riyad Preukschas [Wed, 28 Nov 2012 15:05:11 +0000 (16:05 +0100)]
Fix GitLab Markdown helper spec

11 years agofixed the bug of URIDECODE error
panxiaoming [Wed, 28 Nov 2012 02:09:55 +0000 (10:09 +0800)]
fixed the bug of URIDECODE error

if link to a chinese file name, it will jump to error page;
for example, the chinese file name called "消息文档.md", when after urlencode, it will be "%E6%B6%88%E6%81%AF%E6%96%87%E6%A1%A3.md", but after use History.pushState, will jump to a bad decode link.

11 years agoMerge pull request #2095 from riyad/fix-code-highlighting
Dmitriy Zaporozhets [Tue, 27 Nov 2012 22:17:32 +0000 (14:17 -0800)]
Merge pull request #2095 from riyad/fix-code-highlighting

Fix code highlighting

11 years agoFix CSS for code highlighting
Riyad Preukschas [Tue, 27 Nov 2012 21:50:24 +0000 (22:50 +0100)]
Fix CSS for code highlighting

11 years agoFix code blocks in Markdown not knowing about the user's color scheme
Riyad Preukschas [Tue, 27 Nov 2012 21:49:52 +0000 (22:49 +0100)]
Fix code blocks in Markdown not knowing about the user's color scheme

11 years agoAdd user_color_scheme_class helper
Riyad Preukschas [Tue, 27 Nov 2012 21:49:22 +0000 (22:49 +0100)]
Add user_color_scheme_class helper

11 years agoMerge pull request #2093 from riyad/remove-sqlite
Valeriy Sizov [Tue, 27 Nov 2012 21:41:07 +0000 (13:41 -0800)]
Merge pull request #2093 from riyad/remove-sqlite

Remove SQLite support

11 years agoRemove SQLite support
Riyad Preukschas [Tue, 27 Nov 2012 20:36:09 +0000 (21:36 +0100)]
Remove SQLite support

11 years agoFix group spinach feature
Dmitriy Zaporozhets [Tue, 27 Nov 2012 19:33:56 +0000 (21:33 +0200)]
Fix group spinach feature

11 years agoRemove unused responsive formats
Dmitriy Zaporozhets [Tue, 27 Nov 2012 19:30:39 +0000 (21:30 +0200)]
Remove unused responsive formats

11 years agoFix user creation cause of dual namespace build
Dmitriy Zaporozhets [Tue, 27 Nov 2012 18:27:13 +0000 (18:27 +0000)]
Fix user creation cause of dual namespace build

11 years agoNamespacesHelper
Dmitriy Zaporozhets [Tue, 27 Nov 2012 15:48:25 +0000 (17:48 +0200)]
NamespacesHelper

11 years agoFix invalid method call for gitolite
Dmitriy Zaporozhets [Tue, 27 Nov 2012 14:35:00 +0000 (16:35 +0200)]
Fix invalid method call for gitolite

11 years agoRewrite and improve git backend logic. Fix project movind. Raise exception to prevent...
Dmitriy Zaporozhets [Tue, 27 Nov 2012 06:31:15 +0000 (09:31 +0300)]
Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues

11 years agoRewording for the account being blocked
Tanguy Herrmann [Sat, 24 Nov 2012 17:04:42 +0000 (18:04 +0100)]
Rewording for the account being blocked

When signing in with SSO, if the default behaviour of gitlab is to block SSO user, the only message the people will get is 'Your account was blocked'

They should get the idea this might be only temporary and not because of a technical problem

11 years agoRemove postrgres from travis.yml cause it fails 1week+
Dmitriy Zaporozhets [Fri, 23 Nov 2012 15:39:36 +0000 (17:39 +0200)]
Remove postrgres from travis.yml cause it fails 1week+

11 years agoUp to 3.1.0 v3.1.0
Dmitriy Zaporozhets [Thu, 22 Nov 2012 10:45:16 +0000 (12:45 +0200)]
Up to 3.1.0

11 years agoRewrite hooks shell script
Dmitriy Zaporozhets [Thu, 22 Nov 2012 10:24:46 +0000 (12:24 +0200)]
Rewrite hooks shell script

11 years agoMerge pull request #2033 from mizzy/fix-hash-key-in-backup.rake
Dmitriy Zaporozhets [Thu, 22 Nov 2012 08:51:24 +0000 (00:51 -0800)]
Merge pull request #2033 from mizzy/fix-hash-key-in-backup.rake

Fix hash key settings["gitlab_version"] to settings[:gitlab_version]

11 years agoFix hash key settings["gitlab_version"] to settings[:gitlab_version]
Gosuke Miyashita [Thu, 22 Nov 2012 01:38:56 +0000 (10:38 +0900)]
Fix hash key settings["gitlab_version"] to settings[:gitlab_version]

In backup_create, backup information hash is using symbol as its key.
But in backup_restore, string key is used and it returns empty value.

11 years agoMerge pull request #2026 from koenpunt/extended-image-diff
Dmitriy Zaporozhets [Wed, 21 Nov 2012 20:56:06 +0000 (12:56 -0800)]
Merge pull request #2026 from koenpunt/extended-image-diff

Added bg for transparent images

11 years agoMerge pull request #2030 from tsigo/theme_feedback
Dmitriy Zaporozhets [Wed, 21 Nov 2012 20:54:22 +0000 (12:54 -0800)]
Merge pull request #2030 from tsigo/theme_feedback

Improve user feedback on the Profile > Design page

11 years agoImprove user feedback on the Profile > Design page
Robert Speicher [Wed, 21 Nov 2012 20:01:40 +0000 (15:01 -0500)]
Improve user feedback on the Profile > Design page

- Header changes immediately without a page reload
- Lets the user know that we actually saved their setting when changed

11 years agoFix rendering template for invalid notes
Riyad Preukschas [Wed, 21 Nov 2012 19:26:37 +0000 (20:26 +0100)]
Fix rendering template for invalid notes

11 years agoRefactor GFM JS naming and access
Riyad Preukschas [Wed, 21 Nov 2012 19:23:19 +0000 (20:23 +0100)]
Refactor GFM JS naming and access

11 years agoFix GFM JS code style
Riyad Preukschas [Wed, 21 Nov 2012 19:02:03 +0000 (20:02 +0100)]
Fix GFM JS code style