Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use hashrocket for dasherized attribute27203-fix-ruby21-broken-master | Rémy Coutable | 2017-01-25 | 1 | -4/+4 |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Alejandro Rodríguez | 2017-01-25 | 1 | -0/+8 |
|\ | |||||
| * | Update CHANGELOG.md for 8.16.1 | Robert Speicher | 2017-01-23 | 1 | -0/+8 |
* | | Merge branch 'backport-ee-1067-deal-with-repo-size-limit-as-byte' into 'master' | Yorick Peterse | 2017-01-25 | 4 | -12/+34 |
|\ \ | |||||
| * | | Extract set_project_name_from_path methodbackport-ee-1067-deal-with-repo-size-limit-as-byte | Oswaldo Ferreira | 2017-01-23 | 1 | -11/+15 |
| * | | EE backport for new application settings service | Oswaldo Ferreira | 2017-01-23 | 3 | -1/+19 |
* | | | Merge branch 'fix/cycle-analytics-spec-failure' into 'master' | Rémy Coutable | 2017-01-25 | 1 | -1/+6 |
|\ \ \ | |||||
| * | | | Fix spec failure due to timestamp ordering issue in mySQL | James Lopez | 2017-01-25 | 1 | -1/+6 |
* | | | | Merge branch 'dz-fix-group-canonical-route' into 'master' | Dmitriy Zaporozhets | 2017-01-25 | 2 | -4/+8 |
|\ \ \ \ | |||||
| * | | | | Fix 500 error for Group#web_url method if nested groupdz-fix-group-canonical-route | Dmitriy Zaporozhets | 2017-01-24 | 2 | -4/+8 |
* | | | | | Merge branch 'dz-nested-groups-access-improvements' into 'master' | Dmitriy Zaporozhets | 2017-01-25 | 11 | -15/+118 |
|\ \ \ \ \ | |||||
| * | | | | | Add User#nested_groups and User#nested_projects methods | Dmitriy Zaporozhets | 2017-01-25 | 7 | -4/+73 |
| * | | | | | Refactor Namespace code related to nested groups | Dmitriy Zaporozhets | 2017-01-13 | 6 | -13/+47 |
* | | | | | | Merge branch 'patch-12' into 'master' | Sean McGivern | 2017-01-25 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update enviroments.md - example CURL requests had a typo in the URL | Marc van Gend | 2017-01-24 | 1 | -2/+2 |
* | | | | | | | Merge branch '22072-enable-haml-linters-phase-2' into 'master' | Sean McGivern | 2017-01-25 | 71 | -108/+108 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | HAMLLint: Fix `UnnecessaryInterpolation` and `UnnecessaryStringOutput` offenc...22072-enable-haml-linters-phase-2 | Kushal Pandya | 2017-01-24 | 2 | -3/+3 |
| * | | | | | | | HAMLLint: Enable `MultilinePipe` rule | Kushal Pandya | 2017-01-24 | 1 | -1/+1 |
| * | | | | | | | HAMLLint: Fix `RubyComments` offences | Kushal Pandya | 2017-01-24 | 6 | -13/+13 |
| * | | | | | | | HAMLLint: Enable `RubyComments` rule | Kushal Pandya | 2017-01-24 | 1 | -1/+1 |
| * | | | | | | | HAMLLint: Fix `UnnecessaryStringOutput` offences | Kushal Pandya | 2017-01-24 | 25 | -31/+31 |
| * | | | | | | | HAMLLint: Enable `UnnecessaryStringOutput` rule | Kushal Pandya | 2017-01-24 | 1 | -1/+1 |
| * | | | | | | | HAMLLint: Fix `UnnecessaryInterpolation` offences | Kushal Pandya | 2017-01-24 | 42 | -60/+60 |
| * | | | | | | | HAMLLint: Enable `UnnecessaryInterpolation` rule | Kushal Pandya | 2017-01-24 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'issue-fiter-test-failure' into 'master' | Rémy Coutable | 2017-01-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed error with filter keyboard tests | Phil Hughes | 2017-01-25 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'tc-only-mr-button-if-allowed' into 'master' | Sean McGivern | 2017-01-25 | 3 | -1/+113 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | `can?` already includes the `feature_available?` checktc-only-mr-button-if-allowed | Toon Claes | 2017-01-25 | 1 | -1/+0 |
| * | | | | | | | | | Test there is no Merge Request button when MRs are disabled | Toon Claes | 2017-01-25 | 1 | -0/+14 |
| * | | | | | | | | | Ensure the correct Merge Request button is found | Toon Claes | 2017-01-25 | 1 | -6/+14 |
| * | | | | | | | | | Deduplicate tests for Merge Request buttons | Toon Claes | 2017-01-23 | 4 | -186/+86 |
| * | | | | | | | | | Only show Merge Request button when user can create a MR | Toon Claes | 2017-01-20 | 5 | -0/+191 |
* | | | | | | | | | | Merge branch 'no_project_notes' into 'master' | Sean McGivern | 2017-01-25 | 23 | -36/+347 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | address comments | Jarka Kadlecova | 2017-01-25 | 16 | -58/+141 |
| * | | | | | | | | | make mentions working when project not specified | Jarka Kadlecova | 2017-01-18 | 9 | -10/+54 |
| * | | | | | | | | | Support notes without project | Jarka Kadlecova | 2017-01-18 | 15 | -20/+204 |
* | | | | | | | | | | Merge branch 'grapify-branch-api' into 'master' | Rémy Coutable | 2017-01-25 | 1 | -6/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Grapify last endpoint of the branches APIgrapify-branch-api | Robert Schilling | 2017-01-24 | 1 | -6/+1 |
* | | | | | | | | | | | Merge branch 'fix_broken_diff_discussions' into 'master' | Sean McGivern | 2017-01-25 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Make diff discussion more reliablefix_broken_diff_discussions | Valery Sizov | 2016-12-30 | 2 | -3/+9 |
* | | | | | | | | | | | Merge branch 'filtered-search-hidden-dont-render' into 'master' | Jacob Schatz | 2017-01-25 | 1 | -3/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Correctly resets the default template on destroyfiltered-search-hidden-dont-render | Phil Hughes | 2017-01-23 | 1 | -3/+8 |
| * | | | | | | | | | | | Only render the list if it is visible | Phil Hughes | 2017-01-23 | 1 | -2/+5 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'filtered-search-keyboard-navigation' into 'master' | Jacob Schatz | 2017-01-25 | 8 | -32/+127 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed replacing with a space after a colonfiltered-search-keyboard-navigation | Phil Hughes | 2017-01-23 | 1 | -1/+1 |
| * | | | | | | | | | | | Checks if rendered count has changed rather than relying on key char | Phil Hughes | 2017-01-23 | 2 | -8/+15 |
| * | | | | | | | | | | | Fixed some issues with droplab & keyboard navigation | Phil Hughes | 2017-01-23 | 5 | -23/+76 |
| * | | | | | | | | | | | Fixed currentIndex being shared across dropdowns | Phil Hughes | 2017-01-23 | 1 | -2/+9 |
| * | | | | | | | | | | | Changed character match | Phil Hughes | 2017-01-23 | 1 | -2/+2 |
| * | | | | | | | | | | | Fixed keyboard navigation not working in filtered search bar | Phil Hughes | 2017-01-23 | 3 | -11/+39 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |