Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use `sign_in` instead of `login_as` when we're not testing login flowrs-sign-in-poc | Robert Speicher | 2017-03-28 | 1 | -9/+11 |
* | Merge branch 'tc-api-remove-comments-endpoint' into 'master' | Rémy Coutable | 2017-03-28 | 7 | -148/+68 |
|\ | |||||
| * | API: Make the /notes endpoint work with noteable iid instead of id | Toon Claes | 2017-03-27 | 5 | -55/+68 |
| * | Remove `:id/merge_requests/:merge_request_iid/comments` endpoints | Toon Claes | 2017-03-27 | 2 | -93/+0 |
* | | Merge branch '5983-poll-changes' into 'master' | Jacob Schatz | 2017-03-28 | 2 | -14/+81 |
|\ \ | |||||
| * | | Parses string header into a number | Filipa Lacerda | 2017-03-28 | 1 | -1/+1 |
| * | | Changes after review | Filipa Lacerda | 2017-03-24 | 1 | -7/+9 |
| * | | Adds restart method and auxiliar callback to polling class | Filipa Lacerda | 2017-03-24 | 2 | -10/+75 |
* | | | Merge branch 'calendar-tooltips' into 'master' | Rémy Coutable | 2017-03-28 | 2 | -2/+6 |
|\ \ \ | |||||
| * | | | Add tooltip to user's calendar activities | alex argunov | 2017-03-22 | 2 | -2/+6 |
* | | | | Merge branch 'issuable-sidebar-collapsed-labels-icon' into 'master' | Filipa Lacerda | 2017-03-28 | 2 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | Fixed labels icon being hidden in collapsed issuable sidebar | Phil Hughes | 2017-03-28 | 2 | -1/+7 |
|/ / / / | |||||
* | | | | Merge branch '30098-banzai-filter-mergerequestreferencefilter-has-an-n-1-quer... | Yorick Peterse | 2017-03-28 | 4 | -2/+57 |
|\ \ \ \ | |||||
| * | | | | Add changelog entry | Rémy Coutable | 2017-03-28 | 1 | -0/+4 |
| * | | | | Get rid of a third N+1 query problem | Rémy Coutable | 2017-03-28 | 1 | -1/+3 |
| * | | | | Get rid of second N+1 query problem | Rémy Coutable | 2017-03-28 | 1 | -0/+4 |
| * | | | | Get rid of a first N+1 query problem | Rémy Coutable | 2017-03-28 | 1 | -2/+21 |
| * | | | | Add N+1 query problem specs for Issue and MergeRequest ReferenceFilter classes | Rémy Coutable | 2017-03-28 | 2 | -0/+26 |
* | | | | | Merge branch 'fix-actually-use-knapsack-for-branches-other-than-master' into ... | Kamil Trzciński | 2017-03-28 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Don't include branch name in Knapsack report file | Rémy Coutable | 2017-03-28 | 1 | -2/+2 |
* | | | | | | Merge branch 'user-callout-refactor' into 'master' | Filipa Lacerda | 2017-03-28 | 9 | -77/+87 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactored the user callout class | Phil Hughes | 2017-03-24 | 9 | -77/+87 |
* | | | | | | | Merge remote-tracking branch 'dev/master' | DJ Mountney | 2017-03-28 | 10 | -37/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update CHANGELOG.md for 9.0.1 | DJ Mountney | 2017-03-28 | 10 | -37/+13 |
* | | | | | | | | Merge branch '10120-remove-spread-string-for-array-from' into 'master' | Filipa Lacerda | 2017-03-28 | 2 | -55/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Remove spreadString in favor of polyfilled Array.from10120-remove-spread-string-for-array-from | Eric Eastwood | 2017-03-24 | 2 | -55/+3 |
* | | | | | | | | Merge branch 'fix/gb/environments-folders-route' into 'master' | Kamil Trzciński | 2017-03-28 | 5 | -1/+106 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add controller specs for environment folder action | Grzegorz Bizon | 2017-03-27 | 1 | -0/+33 |
| * | | | | | | | | Add routing specs for environment folders | Grzegorz Bizon | 2017-03-27 | 1 | -0/+49 |
| * | | | | | | | | Add changelog entry for environment folder route fix | Grzegorz Bizon | 2017-03-27 | 1 | -0/+4 |
| * | | | | | | | | Fix environment folder route when special chars present | Grzegorz Bizon | 2017-03-27 | 2 | -1/+20 |
* | | | | | | | | | Merge remote-tracking branch 'dev/master' | DJ Mountney | 2017-03-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update VERSION to 9.1.0-prev9.1.0.pre | James Lopez | 2017-03-22 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'issue-boards-assignee-tooltip-aligment' into 'master' | Annabel Dunstone Gray | 2017-03-28 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixed alignment of tooltip on card assignee | Phil Hughes | 2017-03-28 | 1 | -0/+5 |
* | | | | | | | | | | | Merge branch 'fixed-issue-boards-sidebar-alignment' into 'master' | Annabel Dunstone Gray | 2017-03-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed issue boards sidebar alignment | Phil Hughes | 2017-03-28 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'issue-boards-card-img-triggers-sidebar' into 'master' | Filipa Lacerda | 2017-03-28 | 3 | -6/+23 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Stops triggering board sidebar when clicking avatar | Phil Hughes | 2017-03-28 | 3 | -6/+23 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch '30172-fix-mattermost-enabled-setting-not-properly-stubbed' into... | Sean McGivern | 2017-03-28 | 4 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Add a new `stub_mattermost_setting` stub helper to properly stub Mattermost s... | Rémy Coutable | 2017-03-28 | 4 | -3/+7 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '29874-support-wider-range-of-monitored-environments-with-promet... | Rémy Coutable | 2017-03-28 | 3 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Support wider range of monitored environments with Prometheus | Joshua Lambert | 2017-03-28 | 3 | -7/+7 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'fix-ee_compat_check' into 'master' | Sean McGivern | 2017-03-28 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch` | Rémy Coutable | 2017-03-28 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'rs-empty-project-services' into 'master' | Rémy Coutable | 2017-03-28 | 55 | -119/+143 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use `:empty_project` where possible in service specs | Robert Speicher | 2017-03-27 | 55 | -119/+143 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch '23363-use-strong-params-in-wikis-controller' into 'master' | Rémy Coutable | 2017-03-28 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Update wikis_controller.rb to use strong params | Keifer Furzland | 2017-03-25 | 2 | -1/+5 |
* | | | | | | | | | Merge branch 'fix-knapsack' into 'master' | Robert Speicher | 2017-03-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ |