| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Statisfy eslintcopy-as-md | Douwe Maan | 2017-01-25 | 2 | -13/+13 |
| | | |||||
| * | Merge branch 'master' into copy-as-md | Douwe Maan | 2017-01-25 | 177 | -526/+1392 |
| |\ | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6 | ||||
| | * | Merge branch '27014-fix-pipeline-tooltip-wrapping' into 'master' | Annabel Dunstone Gray | 2017-01-25 | 2 | -0/+8 |
| | |\ | | | | | | | | | | | | | | | | | | | Fix mini-pipeline stage tooltip text wrapping Closes #27014 See merge request !8771 | ||||
| | | * | Fix mini-pipeline stage tooltip text wrapping27014-fix-pipeline-tooltip-wrapping | Eric Eastwood | 2017-01-24 | 2 | -0/+8 |
| | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27014 | ||||
| | * | | Merge branch 'small-screen-fullscreen-button' into 'master' | Clement Ho | 2017-01-25 | 2 | -1/+5 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Display fullscreen button on small screens Closes #19891 See merge request !5302 | ||||
| | | * | | Display fullscreen button on small screens (!5302) | winniehell | 2017-01-25 | 2 | -1/+5 |
| | | | | | |||||
| | * | | | 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 |
| | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | Merge branch 'backport-ee-1067-deal-with-repo-size-limit-as-byte' into 'master' | Yorick Peterse | 2017-01-25 | 4 | -12/+34 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | EE backport for new application settings update service See merge request !8665 | ||||
| | | * | | | 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 Closes #26622 See merge request !8778 | ||||
| | | * | | | | 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 group See merge request !8743 | ||||
| | | * | | | | | Fix 500 error for Group#web_url method if nested groupdz-fix-group-canonical-route | Dmitriy Zaporozhets | 2017-01-24 | 2 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | | Merge branch 'dz-nested-groups-access-improvements' into 'master' | Dmitriy Zaporozhets | 2017-01-25 | 11 | -15/+118 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nested groups feature improvemetns See merge request !8448 | ||||
| | | * | | | | | | Add User#nested_groups and User#nested_projects methods | Dmitriy Zaporozhets | 2017-01-25 | 7 | -4/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | | * | | | | | | Refactor Namespace code related to nested groups | Dmitriy Zaporozhets | 2017-01-13 | 6 | -13/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | | | 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 See merge request cd ../gdk-ee/ | ||||
| | | * | | | | | | | 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 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable HAML-LINT linters phase 2 Closes #22072 See merge request !8566 | ||||
| | | * | | | | | | | HAMLLint: Fix `UnnecessaryInterpolation` and `UnnecessaryStringOutput` ↵22072-enable-haml-linters-phase-2 | Kushal Pandya | 2017-01-24 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offences correctly | ||||
| | | * | | | | | | | 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 See merge request !8777 | ||||
| | | * | | | | | | | | Fixed error with filter keyboard tests | Phil Hughes | 2017-01-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue filter now appends a space & the test wasn't taking this into account when checking the value | ||||
| | * | | | | | | | | | Merge branch 'tc-only-mr-button-if-allowed' into 'master' | Sean McGivern | 2017-01-25 | 3 | -1/+113 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show Merge Request button when user can create a MR See merge request !8639 | ||||
| | | * | | | | | | | | | `can?` already includes the `feature_available?` checktc-only-mr-button-if-allowed | Toon Claes | 2017-01-25 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `can?` already includes the `feature_available?` check, so no need to check this again. | ||||
| | | * | | | | | | | | | Test there is no Merge Request button when MRs are disabled | Toon Claes | 2017-01-25 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case Merge Requests are disabled on the project, no one should see the Merge Request button. | ||||
| | | * | | | | | | | | | Ensure the correct Merge Request button is found | Toon Claes | 2017-01-25 | 1 | -6/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The project was not public and this caused a 404. So the tests were giving deceiving results. By searching for the Merge Request button in `#content-body` this is overcome, and also other Merge Request buttons (e.g. in the sidebar) are ignored. | ||||
| | | * | | | | | | | | | Deduplicate tests for Merge Request buttons | Toon Claes | 2017-01-23 | 4 | -186/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use shared examples to test the presence of the Merge Request button on the various pages. | ||||
| | | * | | | | | | | | | Only show Merge Request button when user can create a MR | Toon Claes | 2017-01-20 | 5 | -0/+191 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Create Merge Request button only should be shown when the user is allowed to create a Merge request. | ||||
| | * | | | | | | | | | | Merge branch 'no_project_notes' into 'master' | Sean McGivern | 2017-01-25 | 23 | -36/+347 |
| | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support notes without a project (personal snippets notes) See merge request !8468 | ||||
| | | * | | | | | | | | | 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 API See merge request !8755 | ||||
| | | * | | | | | | | | | | 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 discussions more reliable Closes #23646 See merge request !8378 | ||||
| | | * | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only render the list if it is visible See merge request !8710 | ||||
| | | * | | | | | | | | | | | 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 keyboard navigation not working in filtered search bar Closes #26840 See merge request !8656 | ||||
| | | * | | | | | | | | | | | Fixed replacing with a space after a colonfiltered-search-keyboard-navigation | Phil Hughes | 2017-01-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |