git.osdn.net Git - wvm/gitlab.git/log

commit | commitdiff | tree

Dmitriy Zaporozhets [Thu, 14 Nov 2013 15:23:31 +0000 (17:23 +0200)]

Small css cleanup

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Thu, 14 Nov 2013 15:01:23 +0000 (17:01 +0200)]

Refactor Chosen.js select css

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 15:56:14 +0000 (17:56 +0200)]

Restyle ui-box to be more flat

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 15:39:04 +0000 (17:39 +0200)]

Nicer ui-box-danger

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 15:34:19 +0000 (17:34 +0200)]

New style for buttons (bootstrap 3 like)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 15:06:24 +0000 (17:06 +0200)]

Fix small select width for trasnfer project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 14:13:40 +0000 (16:13 +0200)]

Extend Gitlab#default_regex. Dont allow project path ends with .git

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 12:21:03 +0000 (14:21 +0200)]

Add additional validation to push event

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 12:17:03 +0000 (14:17 +0200)]

Dont show last push widget if user removed this branch

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 12:10:03 +0000 (14:10 +0200)]

Annotate

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 11:43:40 +0000 (13:43 +0200)]

Fix 500 error for repos with newline in file name

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 08:36:17 +0000 (10:36 +0200)]

Merge branch 'master' of github.com:gitlabhq/gitlabhq

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 08:35:10 +0000 (10:35 +0200)]

Group head titles

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Jacob Vosmaer [Wed, 13 Nov 2013 08:34:57 +0000 (00:34 -0800)]

Merge pull request #5587 from archiloque/fix_omniauth_link

Fix link to auth wiki page

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 08:28:15 +0000 (10:28 +0200)]

Correct head titles for project pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 07:20:36 +0000 (09:20 +0200)]

Improve default theme

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 07:12:22 +0000 (09:12 +0200)]

Improve Charcoal theme

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 07:08:03 +0000 (09:08 +0200)]

Improve violet theme

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 07:03:11 +0000 (09:03 +0200)]

Fix logo overflow when broadcast message displayed

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 13 Nov 2013 06:06:58 +0000 (08:06 +0200)]

Improve chosen selectbox style

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 20:32:28 +0000 (22:32 +0200)]

Improve select UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 18:14:44 +0000 (18:14 +0000)]

Merge branch 'relative' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 18:13:26 +0000 (18:13 +0000)]

Merge branch 'feature/broadcast_messages' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Julien Kirch [Tue, 12 Nov 2013 17:15:26 +0000 (18:15 +0100)]

Fix link to auth wiki

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 16:56:48 +0000 (18:56 +0200)]

Spinach test for broadcast messages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Marin Jankovski [Tue, 12 Nov 2013 14:11:46 +0000 (15:11 +0100)]

Clear state in test satellite dir.

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 13:20:31 +0000 (15:20 +0200)]

Ability to remvoe broadcast messages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 13:08:20 +0000 (15:08 +0200)]

Show broadcast message to users

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 12:32:17 +0000 (14:32 +0200)]

Active tab tests for admin broadcast messages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 12:29:43 +0000 (14:29 +0200)]

Add broadcast messages to admin nav

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 12:28:12 +0000 (14:28 +0200)]

Broadcast messages scaffold in admin area

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 11:47:28 +0000 (13:47 +0200)]

Broadcast message model + migrations

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 10:56:20 +0000 (12:56 +0200)]

Improve UX for project home page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 08:36:09 +0000 (10:36 +0200)]

Fix no-ssh-key-message path for cookie

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Marin Jankovski [Tue, 12 Nov 2013 08:26:17 +0000 (09:26 +0100)]

Merge branch 'master' into relative

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 08:19:58 +0000 (10:19 +0200)]

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 08:19:23 +0000 (10:19 +0200)]

Add ability to hide no ssh key message

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 12 Nov 2013 07:36:01 +0000 (07:36 +0000)]

Merge branch 'do-image' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Sytse Sijbrandij [Mon, 11 Nov 2013 21:03:45 +0000 (16:03 -0500)]

Turnkey Linux has not been updating consistently.

commit | commitdiff | tree

Dmitriy Zaporozhets [Mon, 11 Nov 2013 13:51:48 +0000 (13:51 +0000)]

Merge branch 'feature/edit_file_api' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Dmitriy Zaporozhets [Mon, 11 Nov 2013 12:58:39 +0000 (14:58 +0200)]

Refactor Create/Update file context and lib

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Mon, 11 Nov 2013 12:58:06 +0000 (14:58 +0200)]

API: Edit file in repository

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Mon, 11 Nov 2013 10:48:42 +0000 (02:48 -0800)]

Merge pull request #5575 from chopmann/patch-1

FIX: note-original-content appending itself too many times

commit | commitdiff | tree

Cornelio Hopmann [Sun, 10 Nov 2013 00:06:22 +0000 (00:06 +0000)]

FIX: note-original-content appending itself too many times

commit | commitdiff | tree

Dmitriy Zaporozhets [Sun, 10 Nov 2013 08:43:04 +0000 (10:43 +0200)]

Fix type in API doc

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Sun, 10 Nov 2013 08:41:25 +0000 (00:41 -0800)]

Merge pull request #5566 from dpursehouse/improve-email-notification-message

Improve message in email notifications

commit | commitdiff | tree

Dmitriy Zaporozhets [Sat, 9 Nov 2013 09:44:36 +0000 (01:44 -0800)]

Merge pull request #5570 from iBotPeaches/master

Allow closes/closed & fixes/fixed for automatic issue closing

commit | commitdiff | tree

Dmitriy Zaporozhets [Sat, 9 Nov 2013 09:42:29 +0000 (09:42 +0000)]

Merge branch 'feature/api_create_file' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Dmitriy Zaporozhets [Sat, 9 Nov 2013 09:40:17 +0000 (11:40 +0200)]

Add docs for create file API

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Sat, 9 Nov 2013 07:59:27 +0000 (23:59 -0800)]

Merge pull request #5571 from bke-drewb/email

Fix minor errors/annoyances in email templates

commit | commitdiff | tree

Dmitriy Zaporozhets [Sat, 9 Nov 2013 07:59:04 +0000 (23:59 -0800)]

Merge pull request #4795 from bke-drewb/issue-4769

Issue-4769 - Unable to update case of label

commit | commitdiff | tree

Dmitriy Zaporozhets [Fri, 8 Nov 2013 16:49:38 +0000 (18:49 +0200)]

Make sure private_token for API is a string

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Fri, 8 Nov 2013 16:33:52 +0000 (16:33 +0000)]

Merge branch 'contribution-license-agreement' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Dmitriy Zaporozhets [Fri, 8 Nov 2013 16:29:26 +0000 (18:29 +0200)]

Add specs for Email confirmation

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Drew Blessing [Fri, 8 Nov 2013 15:04:36 +0000 (09:04 -0600)]

Fix minor errors/annoyances in email templates

There was some funny syntax in merge request email templates. There was a ! before
the merge request number when there probably should be a #. This may be some carry over
from markdown but should not be in email templates. There were also some capitalization
discrepancies among the subject lines. For those OCD people out there I standardized the
capitalization. :)

commit | commitdiff | tree

Marin Jankovski [Fri, 8 Nov 2013 16:20:13 +0000 (17:20 +0100)]

commit | commitdiff | tree

Dmitriy Zaporozhets [Fri, 8 Nov 2013 16:19:40 +0000 (16:19 +0000)]

Merge branch 'ra_default' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Dmitriy Zaporozhets [Fri, 8 Nov 2013 16:18:55 +0000 (16:18 +0000)]

Merge branch 'no_separate_gem' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Marin Jankovski [Fri, 8 Nov 2013 15:34:15 +0000 (16:34 +0100)]

commit | commitdiff | tree

Connor Tumbleson [Fri, 8 Nov 2013 13:51:29 +0000 (07:51 -0600)]

Allow closes/closed & fixes/fixed for automatic regex closing

commit | commitdiff | tree

Dmitriy Zaporozhets [Fri, 8 Nov 2013 07:22:50 +0000 (09:22 +0200)]

Removed Project#discover_default_branch since it not needed any more

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

David Pursehouse [Fri, 8 Nov 2013 06:48:45 +0000 (15:48 +0900)]

Improve message in email notifications

commit | commitdiff | tree

Dmitriy Zaporozhets [Thu, 7 Nov 2013 16:53:35 +0000 (18:53 +0200)]

Specs for Create file API

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Thu, 7 Nov 2013 16:53:09 +0000 (18:53 +0200)]

New API: create file in repo

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Marin Jankovski [Thu, 7 Nov 2013 08:56:12 +0000 (09:56 +0100)]

Remove separate installation of charlock_holmes.

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 6 Nov 2013 19:52:37 +0000 (21:52 +0200)]

Require gitlab-shell 1.7.6

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 6 Nov 2013 18:24:19 +0000 (18:24 +0000)]

Merge branch 'improve/default_branch' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 6 Nov 2013 17:43:51 +0000 (19:43 +0200)]

update CHANGELOG with default_branch changes

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 6 Nov 2013 17:38:37 +0000 (19:38 +0200)]

Fix spinach tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 6 Nov 2013 17:14:11 +0000 (19:14 +0200)]

Remove default_branch support from API project creation

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 6 Nov 2013 17:13:45 +0000 (19:13 +0200)]

Replace assign with stub for default_branch

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 6 Nov 2013 16:45:39 +0000 (18:45 +0200)]

Project#default_branch use repo HEAD instead of DB value now

Drop default_branch field from projects table
Use repository.root_ref as value for defautl_branch method
Fixes issue with default_branch and HEAD getting out of sync

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Marin Jankovski [Wed, 6 Nov 2013 12:10:59 +0000 (13:10 +0100)]

Enable rack_attack by default.

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 6 Nov 2013 07:58:43 +0000 (09:58 +0200)]

Refactor search views

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 6 Nov 2013 07:54:42 +0000 (09:54 +0200)]

Look for project description during search

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Wed, 6 Nov 2013 07:32:17 +0000 (09:32 +0200)]

More entries to changelog

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 15:16:29 +0000 (15:16 +0000)]

Merge branch 'feature/leave_project' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 15:15:43 +0000 (17:15 +0200)]

Remove User#namespaces method from code

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 14:58:13 +0000 (16:58 +0200)]

Refactor user associations. Drop support of Group#owner_id

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 14:41:29 +0000 (16:41 +0200)]

New feature: Ability to leave project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 13:35:49 +0000 (15:35 +0200)]

Revert "More escaping"

This reverts commit c46eaca91247ccf8e6fb3b691dad028e1b084ae3.

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 11:35:40 +0000 (13:35 +0200)]

Merge branch 'master' of github.com:gitlabhq/gitlabhq

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 11:35:22 +0000 (11:35 +0000)]

Merge branch 'feature/create_file' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 10:23:11 +0000 (12:23 +0200)]

Hide new file link if not branch HEAD

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 10:21:11 +0000 (12:21 +0200)]

Refactoring for EditTree and NewTree controllers and contexts

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 10:06:52 +0000 (12:06 +0200)]

Move part of file creation logic into separate context

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 08:45:23 +0000 (10:45 +0200)]

Feature test for New file feature

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Jacob Vosmaer [Tue, 5 Nov 2013 08:30:45 +0000 (00:30 -0800)]

Merge pull request #5500 from nkukard/esc-strings2

More escaping

commit | commitdiff | tree

Dmitriy Zaporozhets [Tue, 5 Nov 2013 08:28:49 +0000 (10:28 +0200)]

New feature: Create file from UI

Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

commit | commitdiff | tree

Nigel Kukard [Mon, 4 Nov 2013 22:06:27 +0000 (22:06 +0000)]

More escaping

- Database name may contain characters which are not shell friendly
- Database password could contain the same
- While we at it there is no harm in escaping generated paths too
- Refactored 2-line system(command)

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>

commit | commitdiff | tree

Dmitriy Zaporozhets [Mon, 4 Nov 2013 19:37:21 +0000 (19:37 +0000)]

Merge branch 'consistent-numbering' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Sytse Sijbrandij [Mon, 4 Nov 2013 19:36:07 +0000 (11:36 -0800)]

Number 3 was missing.

commit | commitdiff | tree

Dmitriy Zaporozhets [Mon, 4 Nov 2013 19:30:26 +0000 (19:30 +0000)]

Merge branch 'gitlab_shell_in_patch_doc' of /home/git/repositories/gitlab/gitlabhq

commit | commitdiff | tree

Jacob Vosmaer [Mon, 4 Nov 2013 19:28:07 +0000 (20:28 +0100)]

Include gitlab-shell in patch update doc