summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Version 7.11.4v7.11.47-11-stableJob van der Voort2015-05-281-1/+1
* Merge branch 'rs-dont-follow-me' into 'master'Douwe Maan2015-05-285-2/+89
* Subclass TaskList::Filter to fix a bugRobert Speicher2015-05-276-8/+45
* Version 7.11.3v7.11.3Job van der Voort2015-05-271-1/+1
* Merge branch 'rs-issue-1690' into 'master'Dmitriy Zaporozhets2015-05-272-3/+10
* Version 7.11.2v7.11.2Patricio Cano2015-05-221-1/+1
* Version 7.11.1v7.11.1Job van der Voort2015-05-211-1/+1
* Version 7.11.0v7.11.0Job van der Voort2015-05-211-1/+1
* Merge branch 'cherry-pick-robert' into '7-11-stable'Douwe Maan2015-05-2115-26/+83
|\
| * Merge branch 'fix-atom-feeds' into 'master'Douwe Maan2015-05-217-7/+7
| * Merge pull request #9316 from jvanbaarsen/gitlab-git-updateDouwe Maan2015-05-212-5/+5
| * Merge branch 'rs-issue-1568' into 'master'Douwe Maan2015-05-212-0/+9
| * Merge branch 'unauthorized-participants' into 'master'Dmitriy Zaporozhets2015-05-214-1/+40
| * Customize the sanitization whitelist only onceRobert Speicher2015-05-211-13/+22
|/
* Merge branch 'lexer_error_workaround' into 'master'Douwe Maan2015-05-202-2/+5
* Merge branch 'explain-wip-mr' into 'master'Dmitriy Zaporozhets2015-05-203-5/+13
* Version 7.11.0.rc2v7.11.0.rc2Job van der Voort2015-05-151-1/+1
* Merge branch 'attr_encryped_no_db_connection' into 'master'Dmitriy Zaporozhets2015-05-151-0/+20
* Version 7.11.0.rc1v7.11.0.rc1Job van der Voort2015-05-151-1/+1
* 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
|\ \ \ \