OSDN Git Service
Marin Jankovski [Thu, 26 Sep 2013 20:40:55 +0000 (22:40 +0200)]
Add documentation to help section, rack_attack as example
Marin Jankovski [Tue, 24 Sep 2013 21:12:31 +0000 (23:12 +0200)]
Enable rack attack and add a throttle.
Marin Jankovski [Tue, 24 Sep 2013 18:13:25 +0000 (20:13 +0200)]
Add rack attack gem.
Dmitriy Zaporozhets [Tue, 24 Sep 2013 11:50:37 +0000 (11:50 +0000)]
Fix commits table highlight
Dmitriy Zaporozhets [Tue, 24 Sep 2013 09:08:28 +0000 (12:08 +0300)]
Dont override default table with bootstrap class. Refactor table css
Dmitriy Zaporozhets [Tue, 24 Sep 2013 08:28:42 +0000 (08:28 +0000)]
Merge branch 'feature/require_old_pass' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 24 Sep 2013 07:48:36 +0000 (10:48 +0300)]
Force user to provide old password in order to change it
Dmitriy Zaporozhets [Mon, 23 Sep 2013 06:58:24 +0000 (23:58 -0700)]
Merge pull request #5063 from karlhungus/feature-allow-ldap-update-with-username
Allows username only updates to ldap properties
Izaak Alpert [Mon, 23 Sep 2013 00:25:10 +0000 (20:25 -0400)]
Update for readability
fixed a test a broke in the configurable theme PR
Change-Id: Id894506941bc01ab0d259d48ca7ff9b80bb2c57e
Izaak Alpert [Mon, 16 Sep 2013 04:40:21 +0000 (00:40 -0400)]
Added ldap tests
Change-Id: Ifd77615b3b92d7d8bca92b8875aa8204356cfd85
Izaak Alpert [Thu, 12 Sep 2013 20:27:51 +0000 (16:27 -0400)]
Allows username only updates to ldap properties
-when logging in if users are allowed to login with just usernames in ldap we will update uid of the user if their uid is out of date
Conflicts:
spec/lib/auth_spec.rb
Change-Id: Ia171b3d5133da86edc18c0d08ecfaf6a174f2574
Dmitriy Zaporozhets [Sun, 22 Sep 2013 09:22:51 +0000 (02:22 -0700)]
Merge pull request #5136 from f0k/patch-1
Remove old assets before compiling new ones
Dmitriy Zaporozhets [Sun, 22 Sep 2013 09:21:33 +0000 (02:21 -0700)]
Merge pull request #5142 from karlhungus/bugfix-handle-empty-public-projects
Prevent empty public projects from throwing exceptions
Dmitriy Zaporozhets [Sun, 22 Sep 2013 09:20:26 +0000 (02:20 -0700)]
Merge pull request #5116 from karlhungus/feature-configurable-theme
Make users theme configurable
Dmitriy Zaporozhets [Sun, 22 Sep 2013 09:16:13 +0000 (02:16 -0700)]
Merge pull request #5145 from hiroponz/fix-api-merge-request
Fix API::MergeRequest
Spencer Owen [Tue, 17 Sep 2013 05:52:26 +0000 (23:52 -0600)]
Corrects the update document to match the version of gitshell specified in the install document (1.7.1)
Marin Jankovski [Sun, 22 Sep 2013 08:49:32 +0000 (10:49 +0200)]
Merge branch '6-1-stable'
Dmitriy Zaporozhets [Sun, 22 Sep 2013 08:48:04 +0000 (08:48 +0000)]
Fix hover for tree view
Marin Jankovski [Sun, 22 Sep 2013 08:45:19 +0000 (10:45 +0200)]
Version 6.1.0
Izaak Alpert [Sun, 22 Sep 2013 05:06:22 +0000 (01:06 -0400)]
Defaulted theme to MARS
Change-Id: I02814fb47edcc915309183547cc8dcb165100f4f
Izaak Alpert [Mon, 16 Sep 2013 17:31:22 +0000 (13:31 -0400)]
Make users theme configurable
GITLAB-1262
Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a
Conflicts:
app/models/user.rb
config/initializers/1_settings.rb
spec/models/user_spec.rb
Hiroyuki Sato [Sat, 21 Sep 2013 21:46:36 +0000 (06:46 +0900)]
Fix API::MergeRequest
Fixes #5144 Refs #4996
Sytse Sijbrandij [Sat, 21 Sep 2013 18:59:46 +0000 (20:59 +0200)]
Restyle event title
Sytse Sijbrandij [Sat, 21 Sep 2013 18:33:34 +0000 (20:33 +0200)]
Restyle tree table UI
Sytse Sijbrandij [Sat, 21 Sep 2013 16:55:28 +0000 (18:55 +0200)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Sytse Sijbrandij [Sat, 21 Sep 2013 16:54:18 +0000 (18:54 +0200)]
Update gitlab_git to version 2.3.1
Dmitriy Zaporozhets [Sat, 21 Sep 2013 08:01:52 +0000 (08:01 +0000)]
Merge branch 'update_changelog' of /home/git/repositories/axil/gitlabhq
Izaak Alpert [Fri, 20 Sep 2013 15:39:12 +0000 (11:39 -0400)]
Prevent empty public projects from throwing exceptions
GITLAB-1279 (GITLAB-1264)
Change-Id: Ifb5b4313bc91fae720f8ef5c36152c45e9d38934
Jan Schlüter [Thu, 19 Sep 2013 17:25:40 +0000 (19:25 +0200)]
remove old assets before compiling
Axilleas Pipinellis [Thu, 19 Sep 2013 13:36:37 +0000 (16:36 +0300)]
Add author of new init script
Sytse Sijbrandij [Thu, 19 Sep 2013 08:45:31 +0000 (10:45 +0200)]
README improved. Removed travis badge
Dmitriy Zaporozhets [Wed, 18 Sep 2013 22:48:13 +0000 (22:48 +0000)]
Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 18 Sep 2013 22:47:23 +0000 (15:47 -0700)]
Merge pull request #5099 from yatishmehta27/gitignore-changes
Added .ruby-version & .ruby-gemset in .gitignore
Dmitriy Zaporozhets [Wed, 18 Sep 2013 22:46:04 +0000 (22:46 +0000)]
Merge branch 'changelog-specifics' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Wed, 18 Sep 2013 07:35:38 +0000 (09:35 +0200)]
Add author and issue id warning.
Dmitriy Zaporozhets [Wed, 18 Sep 2013 06:57:17 +0000 (23:57 -0700)]
Merge pull request #5112 from hiroponz/drop-support-of-root-namespace
Drop support of root namespace in model
Dmitriy Zaporozhets [Wed, 18 Sep 2013 06:54:37 +0000 (23:54 -0700)]
Merge pull request #5117 from karlhungus/feature-password-update-skipped-when-ldap-user
Don't show users password change page if ldap users
Izaak Alpert [Tue, 17 Sep 2013 20:37:36 +0000 (16:37 -0400)]
Don't show users password change page if ldap users
Hiroyuki Sato [Tue, 17 Sep 2013 13:12:10 +0000 (22:12 +0900)]
Drop support of root namespace in model
Yatish Mehta [Mon, 16 Sep 2013 13:49:04 +0000 (19:19 +0530)]
Added .ruby-version & .ruby-gemset in .gitignore
Dmitriy Zaporozhets [Mon, 16 Sep 2013 11:04:22 +0000 (14:04 +0300)]
Update docs to use 6-1-stable branch
Dmitriy Zaporozhets [Mon, 16 Sep 2013 10:33:34 +0000 (13:33 +0300)]
Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare
Dmitriy Zaporozhets [Mon, 16 Sep 2013 05:59:11 +0000 (22:59 -0700)]
Merge pull request #5093 from smashwilson/example-config-fix
Fix issue_closing_regex in gitlab.yml.example
Ash Wilson [Sun, 15 Sep 2013 19:46:06 +0000 (15:46 -0400)]
Don't quote the default issue closing regex.
It turns out that regex escapes and YAML quoted-scalar escapes don't play
nicely together.
Dmitriy Zaporozhets [Sat, 14 Sep 2013 19:01:31 +0000 (22:01 +0300)]
Fix tests
Dmitriy Zaporozhets [Sat, 14 Sep 2013 18:18:01 +0000 (21:18 +0300)]
Fix 500 error on admin->project page
Dmitriy Zaporozhets [Sat, 14 Sep 2013 17:55:33 +0000 (20:55 +0300)]
Extend user infiormation displayed on admin user page
Dmitriy Zaporozhets [Sat, 14 Sep 2013 17:51:16 +0000 (20:51 +0300)]
Fix setting default values for user
Dmitriy Zaporozhets [Sat, 14 Sep 2013 15:25:42 +0000 (18:25 +0300)]
Let it be 6.1.0.rc1
Dmitriy Zaporozhets [Sat, 14 Sep 2013 15:24:55 +0000 (18:24 +0300)]
Update CHANGELOG with new entries for 6.1
Dmitriy Zaporozhets [Sat, 14 Sep 2013 15:09:36 +0000 (08:09 -0700)]
Merge pull request #5084 from spudstud/patch-2
Update unicorn.rb.example
Dmitriy Zaporozhets [Sat, 14 Sep 2013 14:47:41 +0000 (07:47 -0700)]
Merge pull request #4996 from hiroponz/drop-support-of-root-namespace
[WIP]Drop support of root namespace in routing
Dmitriy Zaporozhets [Sat, 14 Sep 2013 13:19:56 +0000 (06:19 -0700)]
Merge pull request #5072 from jbornschein/proj-new-public
Add "public-project?" checkbox to new-project view
Joerg Bornschein [Sat, 14 Sep 2013 11:28:15 +0000 (13:28 +0200)]
Use ruby 1.9 hash syntax
Dmitriy Zaporozhets [Sat, 14 Sep 2013 07:17:24 +0000 (00:17 -0700)]
Merge pull request #5051 from jbornschein/patch-1
Minor UI fix in views/public/project/index.html.haml
Dmitriy Zaporozhets [Sat, 14 Sep 2013 07:17:14 +0000 (00:17 -0700)]
Merge pull request #5056 from lewtds/patch-1
Fix typo in installation.md
Dmitriy Zaporozhets [Sat, 14 Sep 2013 07:14:55 +0000 (10:14 +0300)]
Remove code that was accidently added in
5dae40f579f66fdc060de633b183ede7bd8b2ce4
Dmitriy Zaporozhets [Sat, 14 Sep 2013 07:06:43 +0000 (00:06 -0700)]
Merge pull request #5076 from jzi/notify_commit_author
Re-enable notifying commit authors of new commit notes
Spencer [Sat, 14 Sep 2013 01:07:05 +0000 (19:07 -0600)]
Update unicorn.rb.example
Dmitriy Zaporozhets [Fri, 13 Sep 2013 14:23:27 +0000 (14:23 +0000)]
Merge branch 'remote_url_in_project_blank_slate' of /home/git/repositories/gitlab/gitlabhq
Jakub Zienkiewicz [Fri, 13 Sep 2013 13:38:37 +0000 (15:38 +0200)]
notify commit author of new notes
Jakub Zienkiewicz [Fri, 13 Sep 2013 13:38:30 +0000 (15:38 +0200)]
test if commit author receives new note notifications
Joerg Bornschein [Fri, 13 Sep 2013 12:39:04 +0000 (14:39 +0200)]
Add public-project? checkbox to new-project view
Joerg Bornschein [Fri, 13 Sep 2013 11:16:49 +0000 (13:16 +0200)]
Merge branch 'fix-default-opts' into proj-new-public
Joerg Bornschein [Fri, 13 Sep 2013 11:02:37 +0000 (13:02 +0200)]
Fix default settings when creating new Project
Marin Jankovski [Fri, 13 Sep 2013 09:37:13 +0000 (11:37 +0200)]
Test.
Dmitriy Zaporozhets [Fri, 13 Sep 2013 09:31:28 +0000 (09:31 +0000)]
Merge branch 'user-get-notified-on-move' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Fri, 13 Sep 2013 08:12:42 +0000 (10:12 +0200)]
Replace remote url on selection.
Sytse Sijbrandij [Fri, 13 Sep 2013 05:49:45 +0000 (07:49 +0200)]
Typo fix.
Sytse Sijbrandij [Fri, 13 Sep 2013 05:44:30 +0000 (07:44 +0200)]
Notice about moving projects.
Hiroyuki Sato [Thu, 12 Sep 2013 22:30:49 +0000 (07:30 +0900)]
Improve timing problem in spinach test
Hiroyuki Sato [Thu, 5 Sep 2013 11:46:34 +0000 (20:46 +0900)]
Drop support of root namespace in routing
Dmitriy Zaporozhets [Thu, 12 Sep 2013 18:46:31 +0000 (21:46 +0300)]
Add default values to compare page link
Dmitriy Zaporozhets [Thu, 12 Sep 2013 18:40:41 +0000 (18:40 +0000)]
Merge branch 'feature/email_when_added_to_group' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 12 Sep 2013 18:39:27 +0000 (21:39 +0300)]
Compare link for branches
Dmitriy Zaporozhets [Thu, 12 Sep 2013 17:28:59 +0000 (17:28 +0000)]
Merge branch 'argument_error_in_gitlab_check' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 12 Sep 2013 17:23:03 +0000 (20:23 +0300)]
Right branches for mr link at Compare view
Dmitriy Zaporozhets [Thu, 12 Sep 2013 17:15:10 +0000 (20:15 +0300)]
Compare page improved
* Show new merge request button from compare page
* Show message if user selected same branches
* Show message if compared branches are the same
* Prepend inputs with from/to labels
Trung Ngo [Thu, 12 Sep 2013 16:20:55 +0000 (23:20 +0700)]
Fix typo in installation.md
SSH is pronounced as /es es aged/, so we need "an" instead of "a".
Dmitriy Zaporozhets [Thu, 12 Sep 2013 16:00:32 +0000 (19:00 +0300)]
Enable UsersGroup observer, Add group_member methods to NotificationService
Dmitriy Zaporozhets [Thu, 12 Sep 2013 15:59:31 +0000 (18:59 +0300)]
Add UsersGroup observer
Trigger notification service when new user-group relation was created
Dmitriy Zaporozhets [Thu, 12 Sep 2013 14:05:16 +0000 (07:05 -0700)]
Merge pull request #5048 from Nullreff/image-diff
Fix bug with rendering changing images in commits
Dmitriy Zaporozhets [Thu, 12 Sep 2013 14:01:21 +0000 (14:01 +0000)]
Merge branch 'feature/new_landing' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Thu, 12 Sep 2013 13:28:46 +0000 (15:28 +0200)]
Rescue an error if group doesn't exist
Sytse Sijbrandij [Thu, 12 Sep 2013 13:05:27 +0000 (06:05 -0700)]
Merge pull request #5052 from jbornschein/fix-typo
Fix typo in tests
Joerg Bornschein [Thu, 12 Sep 2013 12:30:55 +0000 (14:30 +0200)]
Fix typo in tests
Jörg Bornschein [Thu, 12 Sep 2013 11:33:09 +0000 (13:33 +0200)]
Minor UI change in iews/public/project/index.html.haml
Placeholder in search field was wrong
Ryan Mendivil [Wed, 11 Sep 2013 01:36:04 +0000 (17:36 -0800)]
Fix bug with rendering changing images in commits
When viewing the diff for a changed image file, two bugs occur:
- Both the 'before' and 'after' images link to the 'after' commit
- Visiting the link for either image will cause a error
The first is caused by both image links referencing '@commit.id' rather
than '@commit.parent_id'. The second is caused by the use of
'project_tree_path' which is used for creating links to directories in
the git file tree. 'project_blob_path' which links to files should be
used instead.
Dmitriy Zaporozhets [Wed, 11 Sep 2013 19:50:08 +0000 (22:50 +0300)]
Remove commented tests since nobody is going to fix them
Dmitriy Zaporozhets [Wed, 11 Sep 2013 19:46:37 +0000 (22:46 +0300)]
Truncate some text from dashboard events
Dmitriy Zaporozhets [Wed, 11 Sep 2013 19:27:15 +0000 (12:27 -0700)]
Merge pull request #4743 from karlhungus/feature-users-api-respect-defaults
Update User api to respect default settings
Dmitriy Zaporozhets [Wed, 11 Sep 2013 19:20:51 +0000 (22:20 +0300)]
New landing page when you have 0 projects
Izaak Alpert [Wed, 11 Sep 2013 18:03:26 +0000 (14:03 -0400)]
Removed private scope
Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
Dmitriy Zaporozhets [Wed, 11 Sep 2013 18:17:28 +0000 (21:17 +0300)]
Email templates when user was added to group
Dmitriy Zaporozhets [Wed, 11 Sep 2013 18:12:33 +0000 (21:12 +0300)]
Update poltergeist and database_cleaner
Izaak Alpert [Wed, 11 Sep 2013 16:23:04 +0000 (12:23 -0400)]
Style updates
Change-Id: Ib4eb533dff5c722fe559330e4aa71b5d5baf6fb8
Izaak Alpert [Thu, 15 Aug 2013 21:43:46 +0000 (17:43 -0400)]
Update to only provide one way to get a default user
-calling build_user will now apply defaults and only override them if as: :admin is set
Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
Izaak Alpert [Thu, 8 Aug 2013 18:09:33 +0000 (14:09 -0400)]
Update User api to respect default settings
-API now respects default_projects_limit, default_can_create_group, and default_can_create_team
Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
Dmitriy Zaporozhets [Wed, 11 Sep 2013 18:00:16 +0000 (21:00 +0300)]
Fix 404 if Group guest visit empty group page
Dmitriy Zaporozhets [Wed, 11 Sep 2013 17:27:50 +0000 (20:27 +0300)]
Fix feature test