summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Increase left margin for visibility descriptionsrs-issue-1626Robert Speicher2015-05-161-1/+1
* Fix labels for project/snippet visibility selectionRobert Speicher2015-05-162-2/+2
* Merge branch 'unauthorized-participants' into 'master'Dmitriy Zaporozhets2015-05-166-22/+42
|\
| * Fix specs.unauthorized-participantsDouwe Maan2015-05-153-7/+12
| * Fix.Douwe Maan2015-05-151-1/+1
| * Don't include users without project access in participants.Douwe Maan2015-05-152-7/+15
| * Move stuff around a bit in NotifictionService.Douwe Maan2015-05-151-8/+15
* | Merge branch 'fix-docker-single-postgresql-startup' into 'master'Sytse Sijbrandij2015-05-152-0/+38
|\ \
| * | Set gitlab.rb in Docker single image in order to make PostgreSQL start up pro...Stan Hu2015-05-152-0/+38
* | | Merge branch 'attr_encryped_no_db_connection' into 'master'Dmitriy Zaporozhets2015-05-151-0/+20
|\ \ \
| * | | Fix.Douwe Maan2015-05-151-13/+5
| * | | Improve fix.attr_encryped_no_db_connectionDouwe Maan2015-05-151-13/+12
| * | | Don't require DB conncetion in AttrEncrypted.Douwe Maan2015-05-151-0/+29
|/ / /
* | | Merge pull request #9277 from jvanbaarsen/pr/9061Jeroen van Baarsen2015-05-152-1/+2
|\ \ \
| * | | Ensure that the first added admin performs repository importsFotis Gimian2015-05-152-1/+2
* | | | Merge branch '7-11-guides' into 'master'Job van der Voort2015-05-153-16/+120
|\ \ \ \ | |/ / / |/| | |
| * | | Update installation/update guides for 7.11.Douwe Maan2015-05-153-16/+120
|/ / /
* | | Merge branch 'fix-653' into 'master'Dmitriy Zaporozhets2015-05-151-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix push event.Douwe Maan2015-05-151-1/+1
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-1514-33/+50
|\ \
| * \ Merge branch 'dashboard-references' into 'master'Dmitriy Zaporozhets2015-05-1511-22/+30
| |\ \
| | * | Fix reference links in dashboard activity and ATOM feeds.dashboard-referencesDouwe Maan2015-05-1411-22/+30
| * | | Merge branch 'spinner-spin' into 'master'Dmitriy Zaporozhets2015-05-152-6/+7
| |\ \ \
| | * | | Spin icon next to "Checking for CI status..."spinner-spinDouwe Maan2015-05-142-6/+7
| | |/ /
| * | | Merge branch 'use-count-badges' into 'master'Dmitriy Zaporozhets2015-05-152-5/+13
| |\ \ \
| | * | | Small refactoring of state_filters_text_for helperuse-count-badgesDmitriy Zaporozhets2015-05-141-3/+2
| | * | | append empty space only if count existsDmitriy Zaporozhets2015-05-141-1/+1
| | * | | Use count badges with number_with_delimiter helper for issue, commit countDmitriy Zaporozhets2015-05-142-5/+14
* | | | | Merge pull request #9296 from jorgevbo/masterJeroen van Baarsen2015-05-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix bug with default timezone en RSS gitlab eventsJorge Vasquez2015-05-141-1/+1
* | | | | Fix gemfile.lockDmitriy Zaporozhets2015-05-151-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-148-12/+54
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'project_api_order' into 'master'Dmitriy Zaporozhets2015-05-143-1/+18
| |\ \ \
| | * | | update API docproject_api_orderValery Sizov2015-05-141-0/+3
| | * | | Add order option for projects APIValery Sizov2015-05-142-1/+15
| * | | | Merge branch 'rs-refactor-2fa' into 'master'Dmitriy Zaporozhets2015-05-142-9/+33
| |\ \ \ \
| | * | | | Refactor SessionsController to use a controller concernrs-refactor-2faRobert Speicher2015-05-142-9/+33
| |/ / / /
| * | | | Merge branch 'fix-blob-path' into 'master'Douwe Maan2015-05-143-2/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix broken view when viewing history of a file that includes a path that used...Stan Hu2015-05-133-2/+3
* | | | | Merge pull request #9295 from afc163/masterJeroen van Baarsen2015-05-142-0/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add style for <kbd> element in markdownafc1632015-05-142-0/+17
|/ / / /
* | | | Merge branch 'fewer-icons' into 'master'Dmitriy Zaporozhets2015-05-141-6/+0
|\ \ \ \
| * | | | Use slightly fewer icons in project sidebar.Douwe Maan2015-05-141-6/+0
|/ / / /
* | | | Merge branch 'rs-relative-link-filter' into 'master'Dmitriy Zaporozhets2015-05-143-85/+94
|\ \ \ \
| * | | | Minor RelativeLinkFilter cleanuprs-relative-link-filterRobert Speicher2015-05-133-85/+94
| |/ / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-146-32/+33
|\ \ \ \
| * \ \ \ Merge branch 'fix-group-mention' into 'master'Dmitriy Zaporozhets2015-05-143-3/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add changelog item.fix-group-mentionDouwe Maan2015-05-141-0/+1
| | * | | Fix mentioning of private groups.Douwe Maan2015-05-142-3/+3
| | | |/ | | |/|
| * | | Merge branch 'note-action-icons' into 'master'Dmitriy Zaporozhets2015-05-143-29/+29
| |\ \ \ | | |/ / | |/| |