summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added .ruby-version & .ruby-gemset in .gitignoreYatish Mehta2013-09-161-0/+2
|
* Update docs to use 6-1-stable branchDmitriy Zaporozhets2013-09-161-2/+2
|
* Update gitlab_git to version 2.2.0. Fixes invalid diff in CompareDmitriy Zaporozhets2013-09-163-4/+4
|
* Merge pull request #5093 from smashwilson/example-config-fixDmitriy Zaporozhets2013-09-151-1/+1
|\ | | | | Fix issue_closing_regex in gitlab.yml.example
| * Don't quote the default issue closing regex.Ash Wilson2013-09-151-1/+1
|/ | | | | It turns out that regex escapes and YAML quoted-scalar escapes don't play nicely together.
* Fix testsDmitriy Zaporozhets2013-09-142-8/+14
|
* Fix 500 error on admin->project pageDmitriy Zaporozhets2013-09-142-4/+3
|
* Extend user infiormation displayed on admin user pageDmitriy Zaporozhets2013-09-141-1/+8
|
* Fix setting default values for userDmitriy Zaporozhets2013-09-141-7/+10
|
* Let it be 6.1.0.rc1Dmitriy Zaporozhets2013-09-141-1/+1
|
* Update CHANGELOG with new entries for 6.1Dmitriy Zaporozhets2013-09-141-0/+4
|
* Merge pull request #5084 from spudstud/patch-2Dmitriy Zaporozhets2013-09-141-1/+1
|\ | | | | Update unicorn.rb.example
| * Update unicorn.rb.exampleSpencer2013-09-131-1/+1
| |
* | Merge pull request #4996 from hiroponz/drop-support-of-root-namespaceDmitriy Zaporozhets2013-09-1418-150/+133
|\ \ | | | | | | [WIP]Drop support of root namespace in routing
| * | Improve timing problem in spinach testHiroyuki Sato2013-09-131-1/+4
| | |
| * | Drop support of root namespace in routingHiroyuki Sato2013-09-1317-149/+129
| | |
* | | Merge pull request #5072 from jbornschein/proj-new-publicDmitriy Zaporozhets2013-09-143-8/+14
|\ \ \ | | | | | | | | Add "public-project?" checkbox to new-project view
| * | | Use ruby 1.9 hash syntaxJoerg Bornschein2013-09-141-1/+1
| | | |
| * | | Add public-project? checkbox to new-project viewJoerg Bornschein2013-09-132-7/+13
| | | |
| * | | Merge branch 'fix-default-opts' into proj-new-publicJoerg Bornschein2013-09-131-1/+1
| |\ \ \
| | * | | Fix default settings when creating new ProjectJoerg Bornschein2013-09-131-1/+1
| |/ / /
* | | | Merge pull request #5051 from jbornschein/patch-1Dmitriy Zaporozhets2013-09-141-1/+1
|\ \ \ \ | | | | | | | | | | Minor UI fix in views/public/project/index.html.haml
| * | | | Minor UI change in iews/public/project/index.html.hamlJörg Bornschein2013-09-121-1/+1
| | | | | | | | | | | | | | | Placeholder in search field was wrong
* | | | | Merge pull request #5056 from lewtds/patch-1Dmitriy Zaporozhets2013-09-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in installation.md
| * | | | | Fix typo in installation.mdTrung Ngo2013-09-121-1/+1
| | | | | | | | | | | | | | | | | | SSH is pronounced as /es es aged/, so we need "an" instead of "a".
* | | | | | Remove code that was accidently added in ↵Dmitriy Zaporozhets2013-09-141-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | 5dae40f579f66fdc060de633b183ede7bd8b2ce4
* | | | | | Merge pull request #5076 from jzi/notify_commit_authorDmitriy Zaporozhets2013-09-142-18/+19
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Re-enable notifying commit authors of new commit notes
| * | | | | notify commit author of new notesJakub Zienkiewicz2013-09-131-6/+7
| | | | | |
| * | | | | test if commit author receives new note notificationsJakub Zienkiewicz2013-09-131-12/+12
| | |_|/ / | |/| | |
* | | | | Merge branch 'remote_url_in_project_blank_slate' of ↵Dmitriy Zaporozhets2013-09-134-2/+38
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | | Test.Marin Jankovski2013-09-132-0/+33
| | | | |
| * | | | Replace remote url on selection.Marin Jankovski2013-09-132-2/+5
| | |_|/ | |/| |
* | | | Merge branch 'user-get-notified-on-move' of ↵Dmitriy Zaporozhets2013-09-131-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | Typo fix.Sytse Sijbrandij2013-09-131-1/+1
| | | |
| * | | Notice about moving projects.Sytse Sijbrandij2013-09-131-2/+2
|/ / /
* | | Add default values to compare page linkDmitriy Zaporozhets2013-09-121-1/+1
| | |
* | | Merge branch 'feature/email_when_added_to_group' of ↵Dmitriy Zaporozhets2013-09-1211-13/+102
|\ \ \ | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | Enable UsersGroup observer, Add group_member methods to NotificationServiceDmitriy Zaporozhets2013-09-123-0/+29
| | | |
| * | | Add UsersGroup observerDmitriy Zaporozhets2013-09-122-0/+36
| | | | | | | | | | | | | | | | Trigger notification service when new user-group relation was created
| * | | Email templates when user was added to groupDmitriy Zaporozhets2013-09-116-13/+37
| | | |
* | | | Compare link for branchesDmitriy Zaporozhets2013-09-122-0/+5
| | | |
* | | | Merge branch 'argument_error_in_gitlab_check' of ↵Dmitriy Zaporozhets2013-09-122-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | | Rescue an error if group doesn't existMarin Jankovski2013-09-122-3/+9
| | |_|/ | |/| |
* | | | Right branches for mr link at Compare viewDmitriy Zaporozhets2013-09-121-1/+1
| | | |
* | | | Compare page improvedDmitriy Zaporozhets2013-09-126-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-diffDmitriy Zaporozhets2013-09-123-2/+16
|\ \ \ | | | | | | | | Fix bug with rendering changing images in commits
| * | | Fix bug with rendering changing images in commitsRyan Mendivil2013-09-113-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/gitlabhqDmitriy Zaporozhets2013-09-122-12/+45
|\ \ \
| * | | New landing page when you have 0 projectsDmitriy Zaporozhets2013-09-112-12/+45
| | |/ | |/|
* | | Merge pull request #5052 from jbornschein/fix-typoSytse Sijbrandij2013-09-122-2/+2
|\ \ \ | |_|/ |/| | Fix typo in tests