summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix /explore sorting (trending)27044-fix-explore-sorting-on-trendingEric Eastwood2017-01-254-0/+41
* Merge branch 'backport-ee-1067-deal-with-repo-size-limit-as-byte' into 'master' Yorick Peterse2017-01-254-12/+34
|\
| * Extract set_project_name_from_path methodbackport-ee-1067-deal-with-repo-size-limit-as-byteOswaldo Ferreira2017-01-231-11/+15
| * EE backport for new application settings serviceOswaldo Ferreira2017-01-233-1/+19
* | Merge branch 'fix/cycle-analytics-spec-failure' into 'master' Rémy Coutable2017-01-251-1/+6
|\ \
| * | Fix spec failure due to timestamp ordering issue in mySQLJames Lopez2017-01-251-1/+6
* | | Merge branch 'dz-fix-group-canonical-route' into 'master' Dmitriy Zaporozhets2017-01-252-4/+8
|\ \ \
| * | | Fix 500 error for Group#web_url method if nested groupdz-fix-group-canonical-routeDmitriy Zaporozhets2017-01-242-4/+8
* | | | Merge branch 'dz-nested-groups-access-improvements' into 'master' Dmitriy Zaporozhets2017-01-2511-15/+118
|\ \ \ \
| * | | | Add User#nested_groups and User#nested_projects methodsDmitriy Zaporozhets2017-01-257-4/+73
| * | | | Refactor Namespace code related to nested groupsDmitriy Zaporozhets2017-01-136-13/+47
* | | | | Merge branch 'patch-12' into 'master' Sean McGivern2017-01-251-2/+2
|\ \ \ \ \
| * | | | | Update enviroments.md - example CURL requests had a typo in the URLMarc van Gend2017-01-241-2/+2
* | | | | | Merge branch '22072-enable-haml-linters-phase-2' into 'master' Sean McGivern2017-01-2571-108/+108
|\ \ \ \ \ \
| * | | | | | HAMLLint: Fix `UnnecessaryInterpolation` and `UnnecessaryStringOutput` offenc...22072-enable-haml-linters-phase-2Kushal Pandya2017-01-242-3/+3
| * | | | | | HAMLLint: Enable `MultilinePipe` ruleKushal Pandya2017-01-241-1/+1
| * | | | | | HAMLLint: Fix `RubyComments` offencesKushal Pandya2017-01-246-13/+13
| * | | | | | HAMLLint: Enable `RubyComments` ruleKushal Pandya2017-01-241-1/+1
| * | | | | | HAMLLint: Fix `UnnecessaryStringOutput` offencesKushal Pandya2017-01-2425-31/+31
| * | | | | | HAMLLint: Enable `UnnecessaryStringOutput` ruleKushal Pandya2017-01-241-1/+1
| * | | | | | HAMLLint: Fix `UnnecessaryInterpolation` offencesKushal Pandya2017-01-2442-60/+60
| * | | | | | HAMLLint: Enable `UnnecessaryInterpolation` ruleKushal Pandya2017-01-241-1/+1
* | | | | | | Merge branch 'issue-fiter-test-failure' into 'master' Rémy Coutable2017-01-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed error with filter keyboard testsPhil Hughes2017-01-251-1/+1
* | | | | | | | Merge branch 'tc-only-mr-button-if-allowed' into 'master' Sean McGivern2017-01-253-1/+113
|\ \ \ \ \ \ \ \
| * | | | | | | | `can?` already includes the `feature_available?` checktc-only-mr-button-if-allowedToon Claes2017-01-251-1/+0
| * | | | | | | | Test there is no Merge Request button when MRs are disabledToon Claes2017-01-251-0/+14
| * | | | | | | | Ensure the correct Merge Request button is foundToon Claes2017-01-251-6/+14
| * | | | | | | | Deduplicate tests for Merge Request buttonsToon Claes2017-01-234-186/+86
| * | | | | | | | Only show Merge Request button when user can create a MRToon Claes2017-01-205-0/+191
* | | | | | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-2523-36/+347
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | address commentsJarka Kadlecova2017-01-2516-58/+141
| * | | | | | | | make mentions working when project not specifiedJarka Kadlecova2017-01-189-10/+54
| * | | | | | | | Support notes without projectJarka Kadlecova2017-01-1815-20/+204
* | | | | | | | | Merge branch 'grapify-branch-api' into 'master'Rémy Coutable2017-01-251-6/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Grapify last endpoint of the branches APIgrapify-branch-apiRobert Schilling2017-01-241-6/+1
* | | | | | | | | | Merge branch 'fix_broken_diff_discussions' into 'master' Sean McGivern2017-01-252-3/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Make diff discussion more reliablefix_broken_diff_discussionsValery Sizov2016-12-302-3/+9
* | | | | | | | | | Merge branch 'filtered-search-hidden-dont-render' into 'master'Jacob Schatz2017-01-251-3/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correctly resets the default template on destroyfiltered-search-hidden-dont-renderPhil Hughes2017-01-231-3/+8
| * | | | | | | | | | Only render the list if it is visiblePhil Hughes2017-01-231-2/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'filtered-search-keyboard-navigation' into 'master'Jacob Schatz2017-01-258-32/+127
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed replacing with a space after a colonfiltered-search-keyboard-navigationPhil Hughes2017-01-231-1/+1
| * | | | | | | | | | Checks if rendered count has changed rather than relying on key charPhil Hughes2017-01-232-8/+15
| * | | | | | | | | | Fixed some issues with droplab & keyboard navigationPhil Hughes2017-01-235-23/+76
| * | | | | | | | | | Fixed currentIndex being shared across dropdownsPhil Hughes2017-01-231-2/+9
| * | | | | | | | | | Changed character matchPhil Hughes2017-01-231-2/+2
| * | | | | | | | | | Fixed keyboard navigation not working in filtered search barPhil Hughes2017-01-233-11/+39
* | | | | | | | | | | Merge branch 'mrchrisw/rake-redis' into 'master' Stan Hu2017-01-252-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add redis version to info rake taskmrchrisw/rake-redisChris Wilson2017-01-242-1/+5
View Lorry Controller Status