Dmitriy Zaporozhets
540b3ee563
Merge pull request #5099 from yatishmehta27/gitignore-changes
...
Added .ruby-version & .ruby-gemset in .gitignore
2013-09-18 15:47:23 -07:00
Dmitriy Zaporozhets
8672203baf
Merge pull request #5112 from hiroponz/drop-support-of-root-namespace
...
Drop support of root namespace in model
2013-09-17 23:57:17 -07:00
Dmitriy Zaporozhets
9fabd70323
Merge pull request #5117 from karlhungus/feature-password-update-skipped-when-ldap-user
...
Don't show users password change page if ldap users
2013-09-17 23:54:37 -07:00
Izaak Alpert
ca1b67ce38
Don't show users password change page if ldap users
2013-09-17 22:38:08 -04:00
Hiroyuki Sato
a3ef683108
Drop support of root namespace in model
2013-09-17 23:05:42 +09:00
Yatish Mehta
1b1c81b175
Added .ruby-version & .ruby-gemset in .gitignore
2013-09-16 19:19:04 +05:30
Dmitriy Zaporozhets
16b6040c2e
Update docs to use 6-1-stable branch
2013-09-16 14:04:22 +03:00
Dmitriy Zaporozhets
9c629a1ebc
Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare
2013-09-16 13:33:34 +03:00
Dmitriy Zaporozhets
2d31a9f345
Merge pull request #5093 from smashwilson/example-config-fix
...
Fix issue_closing_regex in gitlab.yml.example
2013-09-15 22:59:11 -07:00
Ash Wilson
8bbb5628c4
Don't quote the default issue closing regex.
...
It turns out that regex escapes and YAML quoted-scalar escapes don't play
nicely together.
2013-09-15 15:46:32 -04:00
Dmitriy Zaporozhets
e0e88cddd8
Fix tests
2013-09-14 22:01:31 +03:00
Dmitriy Zaporozhets
90dc5ff5fd
Fix 500 error on admin->project page
2013-09-14 21:18:01 +03:00
Dmitriy Zaporozhets
74a621385f
Extend user infiormation displayed on admin user page
2013-09-14 20:55:33 +03:00
Dmitriy Zaporozhets
a51562d6d9
Fix setting default values for user
2013-09-14 20:51:16 +03:00
Dmitriy Zaporozhets
3fe2558a5c
Let it be 6.1.0.rc1
2013-09-14 18:25:42 +03:00
Dmitriy Zaporozhets
7311477e48
Update CHANGELOG with new entries for 6.1
2013-09-14 18:24:55 +03:00
Dmitriy Zaporozhets
9f2e19b064
Merge pull request #5084 from spudstud/patch-2
...
Update unicorn.rb.example
2013-09-14 08:09:36 -07:00
Dmitriy Zaporozhets
2898d92397
Merge pull request #4996 from hiroponz/drop-support-of-root-namespace
...
[WIP]Drop support of root namespace in routing
2013-09-14 07:47:41 -07:00
Dmitriy Zaporozhets
df92d4ff67
Merge pull request #5072 from jbornschein/proj-new-public
...
Add "public-project?" checkbox to new-project view
2013-09-14 06:19:56 -07:00
Joerg Bornschein
c71460d2d3
Use ruby 1.9 hash syntax
2013-09-14 13:28:15 +02:00
Dmitriy Zaporozhets
c479b1dd1f
Merge pull request #5051 from jbornschein/patch-1
...
Minor UI fix in views/public/project/index.html.haml
2013-09-14 00:17:24 -07:00
Dmitriy Zaporozhets
4ed9fde654
Merge pull request #5056 from lewtds/patch-1
...
Fix typo in installation.md
2013-09-14 00:17:14 -07:00
Dmitriy Zaporozhets
4f9098032c
Remove code that was accidently added in 5dae40f579
2013-09-14 10:14:55 +03:00
Dmitriy Zaporozhets
6df16564ef
Merge pull request #5076 from jzi/notify_commit_author
...
Re-enable notifying commit authors of new commit notes
2013-09-14 00:06:43 -07:00
Spencer
53b75acf79
Update unicorn.rb.example
2013-09-13 19:07:05 -06:00
Dmitriy Zaporozhets
6113d80639
Merge branch 'remote_url_in_project_blank_slate' of /home/git/repositories/gitlab/gitlabhq
2013-09-13 14:23:27 +00:00
Jakub Zienkiewicz
49f609a936
notify commit author of new notes
2013-09-13 15:38:37 +02:00
Jakub Zienkiewicz
996d146cbd
test if commit author receives new note notifications
2013-09-13 15:38:30 +02:00
Joerg Bornschein
83b212a4ef
Add public-project? checkbox to new-project view
2013-09-13 14:39:04 +02:00
Joerg Bornschein
4d5cdbd286
Merge branch 'fix-default-opts' into proj-new-public
2013-09-13 13:16:49 +02:00
Joerg Bornschein
8199be83f5
Fix default settings when creating new Project
2013-09-13 13:02:37 +02:00
Marin Jankovski
c606df8fdf
Test.
2013-09-13 11:37:13 +02:00
Dmitriy Zaporozhets
5ff79f9494
Merge branch 'user-get-notified-on-move' of /home/git/repositories/gitlab/gitlabhq
2013-09-13 09:31:28 +00:00
Marin Jankovski
91e112ffe2
Replace remote url on selection.
2013-09-13 10:12:42 +02:00
Sytse Sijbrandij
1045ea6476
Typo fix.
2013-09-13 07:49:45 +02:00
Sytse Sijbrandij
86d14441a4
Notice about moving projects.
2013-09-13 07:44:30 +02:00
Hiroyuki Sato
553841eced
Improve timing problem in spinach test
2013-09-13 07:30:49 +09:00
Hiroyuki Sato
df9cbbc924
Drop support of root namespace in routing
2013-09-13 07:00:24 +09:00
Dmitriy Zaporozhets
e1ca9de0da
Add default values to compare page link
2013-09-12 21:46:31 +03:00
Dmitriy Zaporozhets
839c3b198e
Merge branch 'feature/email_when_added_to_group' of /home/git/repositories/gitlab/gitlabhq
2013-09-12 18:40:41 +00:00
Dmitriy Zaporozhets
069a6dfa91
Compare link for branches
2013-09-12 21:39:53 +03:00
Dmitriy Zaporozhets
6f037b9fe8
Merge branch 'argument_error_in_gitlab_check' of /home/git/repositories/gitlab/gitlabhq
2013-09-12 17:28:59 +00:00
Dmitriy Zaporozhets
ed72e949f2
Right branches for mr link at Compare view
2013-09-12 20:23:03 +03:00
Dmitriy Zaporozhets
f774949d3f
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
2013-09-12 20:15:10 +03:00
Trung Ngo
00ce286374
Fix typo in installation.md
...
SSH is pronounced as /es es aged/, so we need "an" instead of "a".
2013-09-12 23:20:55 +07:00
Dmitriy Zaporozhets
c1dd31cf8b
Enable UsersGroup observer, Add group_member methods to NotificationService
2013-09-12 19:00:32 +03:00
Dmitriy Zaporozhets
8589824f00
Add UsersGroup observer
...
Trigger notification service when new user-group relation was created
2013-09-12 18:59:31 +03:00
Dmitriy Zaporozhets
edb3368c93
Merge pull request #5048 from Nullreff/image-diff
...
Fix bug with rendering changing images in commits
2013-09-12 07:05:16 -07:00
Dmitriy Zaporozhets
4f9bc937b3
Merge branch 'feature/new_landing' of /home/git/repositories/gitlab/gitlabhq
2013-09-12 14:01:21 +00:00
Marin Jankovski
cb6d7e5192
Rescue an error if group doesn't exist
2013-09-12 15:28:46 +02:00