summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'commits_statistic' into 'master'test-fixMarin Jankovski2015-03-042-2/+2
|\
| * Spelling change Commit StatisticsSabba Petri2015-03-032-2/+2
* | Merge branch 'build_page_text' into 'master'Marin Jankovski2015-03-041-3/+3
|\ \
| * | Changed casingSabba Petri2015-03-031-3/+3
| * | Changed to 'View Build Page'Sabba Petri2015-03-031-3/+3
| |/
* | Remove pull-review badge since we dont use itDmitriy Zaporozhets2015-03-031-2/+0
|/
* Merge branch 'fix-namespace-merge-request-url' into 'master'Marin Jankovski2015-03-042-12/+8
|\
| * Fix URL builder to use GitlabRoutingHelperStan Hu2015-03-032-12/+8
* | Merge branch 'fix-edit-note-with-votes' into 'master'Marin Jankovski2015-03-038-5/+45
|\ \
| * | Fix bug where editing a comment with "+1" or "-1" would cause a server errorStan Hu2015-03-028-5/+45
* | | Merge branch 'project-existence-leak' into 'master'Dmitriy Zaporozhets2015-03-033-41/+196
|\ \ \
| * | | Add tests for GrackAuth.Douwe Maan2015-03-031-0/+146
| * | | Don't leak information about private project existence via Git-over-SSH/HTTP.Douwe Maan2015-03-022-41/+50
* | | | Merge branch 'go-import' into 'master'Marin Jankovski2015-03-035-20/+32
|\ \ \ \
| * | | | Render go-import meta tag for private repos.Douwe Maan2015-03-034-7/+32
| * | | | Revert "Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/g...Douwe Maan2015-03-033-20/+7
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-03-031-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #8911 from AKoetsier/changelog-8501Jeroen van Baarsen2015-03-031-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fixed changelog for MR 8501Andrès Koetsier2015-03-031-1/+1
| |/ / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-034-1/+19
|\ \ \ \ \
| * \ \ \ \ Merge branch 'commit_calendar_branches' into 'master'Jeroen van Baarsen2015-03-031-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Count commits in branches as well in the commit calendarHannes Rosenögger2015-03-031-1/+1
| | |/ / /
| * | | | Merge branch 'fix-merge-request-url-builder' into 'master'Jeroen van Baarsen2015-03-033-0/+18
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix merge request URL passed to Webhooks.Stan Hu2015-02-243-0/+18
* | | | | Merge branch 'installtion-from-source' into 'master'Dmitriy Zaporozhets2015-03-031-1/+1
|\ \ \ \ \
| * | | | | Clearly mark it as installation from source.Sytse Sijbrandij2015-03-031-1/+1
* | | | | | Merge branch 'user-select-unassigned' into 'master'Dmitriy Zaporozhets2015-03-031-8/+9
|\ \ \ \ \ \
| * | | | | | Don't show Unassigned in user select when searching.Douwe Maan2015-03-031-8/+9
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'case-sensetivity-import' into 'master'Dmitriy Zaporozhets2015-03-033-1/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix import check for case sensetive namespacesDmitriy Zaporozhets2015-03-023-1/+16
|/ / / / /
* | | | | Merge branch 'strict-rubocop-rules' into 'master'Dmitriy Zaporozhets2015-03-032-2/+2
|\ \ \ \ \
| * | | | | Enable ParenthesesAsGroupedExpression ruleDmitriy Zaporozhets2015-03-022-2/+2
* | | | | | Merge branch 'brakeman' into 'master'Dmitriy Zaporozhets2015-03-0310-16/+75
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update ci setup documenationDmitriy Zaporozhets2015-03-021-1/+4
| * | | | | Add brakeman and jasmineDmitriy Zaporozhets2015-03-022-1/+2
| * | | | | Add brakeman rake task and improve code securityDmitriy Zaporozhets2015-03-025-15/+40
| * | | | | Add rake task for brakemanDmitriy Zaporozhets2015-03-021-0/+9
| * | | | | Add brakeman gemDmitriy Zaporozhets2015-03-022-0/+21
|/ / / / /
* | | | | Merge branch 'cirosantilli-link-to-button' into 'master'Dmitriy Zaporozhets2015-03-0310-14/+15
|\ \ \ \ \
| * \ \ \ \ Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq int...Dmitriy Zaporozhets2015-03-0210-14/+15
| |\ \ \ \ \
| | * | | | | Convert Javascript links to buttons.Ciro Santilli2015-01-1710-14/+15
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-022-4/+4
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #8092 from cirosantilli/factor-finder-permsDmitriy Zaporozhets2015-03-021-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Factor permission check in issuable finderCiro Santilli2015-01-011-1/+1
| * | | | | | | | Merge pull request #8349 from divineforest/cleanup-assets-compressDmitriy Zaporozhets2015-03-021-3/+3
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Remove useless `assets.compress` option, Rails 4 uses only `assets.js_compres...Alexander Balashov2014-11-181-3/+3
* | | | | | | | | Merge branch 'less-sql-queries' into 'master'Dmitriy Zaporozhets2015-03-022-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Reduce amount of sql queries on dashboard projects pageDmitriy Zaporozhets2015-03-022-2/+2
* | | | | | | | | Merge pull request #8812 from opichals/teamcity_branchName_not_to_be_whole_refDmitriy Zaporozhets2015-03-021-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix for TeamCity buildQueue REST API build/@branchName.Standa Opichal2015-02-191-2/+2