Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added .ruby-version & .ruby-gemset in .gitignore | Yatish Mehta | 2013-09-16 | 1 | -0/+2 |
| | |||||
* | Update docs to use 6-1-stable branch | Dmitriy Zaporozhets | 2013-09-16 | 1 | -2/+2 |
| | |||||
* | Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare | Dmitriy Zaporozhets | 2013-09-16 | 3 | -4/+4 |
| | |||||
* | Merge pull request #5093 from smashwilson/example-config-fix | Dmitriy Zaporozhets | 2013-09-15 | 1 | -1/+1 |
|\ | | | | | Fix issue_closing_regex in gitlab.yml.example | ||||
| * | Don't quote the default issue closing regex. | Ash Wilson | 2013-09-15 | 1 | -1/+1 |
|/ | | | | | It turns out that regex escapes and YAML quoted-scalar escapes don't play nicely together. | ||||
* | Fix tests | Dmitriy Zaporozhets | 2013-09-14 | 2 | -8/+14 |
| | |||||
* | Fix 500 error on admin->project page | Dmitriy Zaporozhets | 2013-09-14 | 2 | -4/+3 |
| | |||||
* | Extend user infiormation displayed on admin user page | Dmitriy Zaporozhets | 2013-09-14 | 1 | -1/+8 |
| | |||||
* | Fix setting default values for user | Dmitriy Zaporozhets | 2013-09-14 | 1 | -7/+10 |
| | |||||
* | Let it be 6.1.0.rc1 | Dmitriy Zaporozhets | 2013-09-14 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG with new entries for 6.1 | Dmitriy Zaporozhets | 2013-09-14 | 1 | -0/+4 |
| | |||||
* | Merge pull request #5084 from spudstud/patch-2 | Dmitriy Zaporozhets | 2013-09-14 | 1 | -1/+1 |
|\ | | | | | Update unicorn.rb.example | ||||
| * | Update unicorn.rb.example | Spencer | 2013-09-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4996 from hiroponz/drop-support-of-root-namespace | Dmitriy Zaporozhets | 2013-09-14 | 18 | -150/+133 |
|\ \ | | | | | | | [WIP]Drop support of root namespace in routing | ||||
| * | | Improve timing problem in spinach test | Hiroyuki Sato | 2013-09-13 | 1 | -1/+4 |
| | | | |||||
| * | | Drop support of root namespace in routing | Hiroyuki Sato | 2013-09-13 | 17 | -149/+129 |
| | | | |||||
* | | | Merge pull request #5072 from jbornschein/proj-new-public | Dmitriy Zaporozhets | 2013-09-14 | 3 | -8/+14 |
|\ \ \ | | | | | | | | | Add "public-project?" checkbox to new-project view | ||||
| * | | | Use ruby 1.9 hash syntax | Joerg Bornschein | 2013-09-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add public-project? checkbox to new-project view | Joerg Bornschein | 2013-09-13 | 2 | -7/+13 |
| | | | | |||||
| * | | | Merge branch 'fix-default-opts' into proj-new-public | Joerg Bornschein | 2013-09-13 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix default settings when creating new Project | Joerg Bornschein | 2013-09-13 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #5051 from jbornschein/patch-1 | Dmitriy Zaporozhets | 2013-09-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Minor UI fix in views/public/project/index.html.haml | ||||
| * | | | | Minor UI change in iews/public/project/index.html.haml | Jörg Bornschein | 2013-09-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Placeholder in search field was wrong | ||||
* | | | | | Merge pull request #5056 from lewtds/patch-1 | Dmitriy Zaporozhets | 2013-09-14 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix typo in installation.md | ||||
| * | | | | | Fix typo in installation.md | Trung Ngo | 2013-09-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | SSH is pronounced as /es es aged/, so we need "an" instead of "a". | ||||
* | | | | | | Remove code that was accidently added in ↵ | Dmitriy Zaporozhets | 2013-09-14 | 1 | -66/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | 5dae40f579f66fdc060de633b183ede7bd8b2ce4 | ||||
* | | | | | | Merge pull request #5076 from jzi/notify_commit_author | Dmitriy Zaporozhets | 2013-09-14 | 2 | -18/+19 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Re-enable notifying commit authors of new commit notes | ||||
| * | | | | | notify commit author of new notes | Jakub Zienkiewicz | 2013-09-13 | 1 | -6/+7 |
| | | | | | | |||||
| * | | | | | test if commit author receives new note notifications | Jakub Zienkiewicz | 2013-09-13 | 1 | -12/+12 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'remote_url_in_project_blank_slate' of ↵ | Dmitriy Zaporozhets | 2013-09-13 | 4 | -2/+38 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | /home/git/repositories/gitlab/gitlabhq | ||||
| * | | | | Test. | Marin Jankovski | 2013-09-13 | 2 | -0/+33 |
| | | | | | |||||
| * | | | | Replace remote url on selection. | Marin Jankovski | 2013-09-13 | 2 | -2/+5 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'user-get-notified-on-move' of ↵ | Dmitriy Zaporozhets | 2013-09-13 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | | | | | /home/git/repositories/gitlab/gitlabhq | ||||
| * | | | Typo fix. | Sytse Sijbrandij | 2013-09-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Notice about moving projects. | Sytse Sijbrandij | 2013-09-13 | 1 | -2/+2 |
|/ / / | |||||
* | | | Add default values to compare page link | Dmitriy Zaporozhets | 2013-09-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'feature/email_when_added_to_group' of ↵ | Dmitriy Zaporozhets | 2013-09-12 | 11 | -13/+102 |
|\ \ \ | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq | ||||
| * | | | Enable UsersGroup observer, Add group_member methods to NotificationService | Dmitriy Zaporozhets | 2013-09-12 | 3 | -0/+29 |
| | | | | |||||
| * | | | Add UsersGroup observer | Dmitriy Zaporozhets | 2013-09-12 | 2 | -0/+36 |
| | | | | | | | | | | | | | | | | Trigger notification service when new user-group relation was created | ||||
| * | | | Email templates when user was added to group | Dmitriy Zaporozhets | 2013-09-11 | 6 | -13/+37 |
| | | | | |||||
* | | | | Compare link for branches | Dmitriy Zaporozhets | 2013-09-12 | 2 | -0/+5 |
| | | | | |||||
* | | | | Merge branch 'argument_error_in_gitlab_check' of ↵ | Dmitriy Zaporozhets | 2013-09-12 | 2 | -3/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq | ||||
| * | | | | Rescue an error if group doesn't exist | Marin Jankovski | 2013-09-12 | 2 | -3/+9 |
| | |_|/ | |/| | | |||||
* | | | | Right branches for mr link at Compare view | Dmitriy Zaporozhets | 2013-09-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Compare page improved | Dmitriy Zaporozhets | 2013-09-12 | 6 | -33/+58 |
| |_|/ |/| | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | Merge pull request #5048 from Nullreff/image-diff | Dmitriy Zaporozhets | 2013-09-12 | 3 | -2/+16 |
|\ \ \ | | | | | | | | | Fix bug with rendering changing images in commits | ||||
| * | | | Fix bug with rendering changing images in commits | Ryan Mendivil | 2013-09-11 | 3 | -2/+16 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge branch 'feature/new_landing' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-09-12 | 2 | -12/+45 |
|\ \ \ | |||||
| * | | | New landing page when you have 0 projects | Dmitriy Zaporozhets | 2013-09-11 | 2 | -12/+45 |
| | |/ | |/| | |||||
* | | | Merge pull request #5052 from jbornschein/fix-typo | Sytse Sijbrandij | 2013-09-12 | 2 | -2/+2 |
|\ \ \ | |_|/ |/| | | Fix typo in tests |