Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'issue_25900_2' into 'master' | Sean McGivern | 2017-02-13 | 1 | -0/+57 |
|\ | | | | | | | | | | | | | Gather issuable metadata to avoid n+ queries on index view Closes #25900 See merge request !9006 | ||||
| * | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2 | Felipe Artur | 2017-02-09 | 1 | -0/+57 |
| | | |||||
* | | Fix issue boards sidebar alignment and sidebar toggle spec | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
| | | |||||
* | | Fix failing conflicts test | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '27963-tooltips-jobs' into 'master' | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Fixes tooltips in mini pipeline graph Closes #27963 and #28008 See merge request !9140 | ||||
| * | | Fix broken test to use trigger in order to not take tooltip overlaping in ↵ | Filipa Lacerda | 2017-02-10 | 1 | -1/+1 |
| | | | | | | | | | | | | consideration | ||||
* | | | Merge branch 'rs-warden-blocked-users' into 'master' | Robert Speicher | 2017-02-10 | 1 | -0/+16 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't perform Devise trackable updates on blocked User records Closes #27519 See merge request !8915 | ||||
| * | | | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-users | Robert Speicher | 2017-02-10 | 1 | -0/+16 |
| | | | | |||||
* | | | | Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master' | Kamil Trzciński | 2017-02-10 | 1 | -0/+16 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Resolve "Add environment URL link to terminal page" Closes #27336 See merge request !9107 | ||||
| * | | | Added env external link and light web terminal spec27336-add-environment-url-link-to-terminal-page | Luke "Jared" Bennett | 2017-02-10 | 1 | -0/+16 |
| | | | | |||||
* | | | | Merge branch 'dz-nested-groups-members-page' into 'master' | Dmitriy Zaporozhets | 2017-02-10 | 1 | -0/+40 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Nested groups members page See merge request !9062 | ||||
| * | | | Show parent group members for nested groupdz-nested-groups-members-page | Dmitriy Zaporozhets | 2017-02-10 | 1 | -0/+40 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Fix admin_labels_spec.rb transient failureissue_27855 | Felipe Artur | 2017-02-10 | 1 | -5/+6 |
| | | | | |||||
* | | | | Merge branch 'protected-branch-dropdown-titles' into 'master' | Jacob Schatz | 2017-02-10 | 1 | -2/+10 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added header to protected branches access dropdowns See merge request !8774 | ||||
| * | | | | Added header to protected branches access dropdownsprotected-branch-dropdown-titles | Phil Hughes | 2017-01-26 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | CE part of https://gitlab.com/gitlab-org/gitlab-ee/issues/1294 | ||||
* | | | | | Merge branch 'revert-0ef587b6' into 'master' | Filipa Lacerda | 2017-02-09 | 2 | -16/+16 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Responsive title in diffs inline, side by side, with and without sidebar Closes #25709 See merge request !8707 | ||||
| * | | | | Fix expand_collapse_diffs specsrevert-0ef587b6 | Annabel Dunstone Gray | 2017-02-09 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | Use a new class to keep old behavior | Filipa Lacerda | 2017-02-08 | 2 | -16/+16 |
| | | | | | |||||
* | | | | | Merge branch 'move-user-snippets-spinach-test-to-rspec' into 'master' | Rémy Coutable | 2017-02-09 | 1 | -0/+49 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Move 'User Snippets' Spinach feature to Rspec See merge request !8574 | ||||
| * | | | | Move 'User Snippets' Spinach feature to Rspec | the-undefined | 2017-01-16 | 1 | -0/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves the `snippets/user.feature` Spinach test to a Rspec feature, as part of deprecating the Spinach test suite. - Remove Spinach discover snippets feature and steps - Add Rspec feature test | ||||
* | | | | | Correctly transform an anchor link to GFM when copying it | Douwe Maan | 2017-02-09 | 1 | -0/+2 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'dz-create-nested-groups-via-ui' into 'master' | Dmitriy Zaporozhets | 2017-02-09 | 1 | -1/+18 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Allow creating nested group via UI See merge request !8786 | ||||
| * | | | Allow creating nested group via UIdz-create-nested-groups-via-ui | Dmitriy Zaporozhets | 2017-02-07 | 1 | -1/+18 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'remove-jquery-ui-datepicker' into 'master' | Jacob Schatz | 2017-02-08 | 4 | -17/+21 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI datepicker See merge request !8421 | ||||
| * | | | | Changed date check testremove-jquery-ui-datepicker | Phil Hughes | 2017-02-06 | 1 | -19/+23 |
| | | | | | |||||
| * | | | | Fixed missing edit link click | Phil Hughes | 2017-02-06 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Fixed some specs | Phil Hughes | 2017-02-06 | 4 | -31/+29 |
| |/ / / | | | | | | | | | | | | | CHANGELOG item | ||||
* | | | | Merge branch 'remove-jquery-ui-sortable' into 'master' | Jacob Schatz | 2017-02-08 | 3 | -17/+19 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI sortable See merge request !8478 | ||||
| * | | | | Removed jQuery UI sortableremove-jquery-ui-sortable | Phil Hughes | 2017-02-06 | 3 | -17/+19 |
| |/ / / | |||||
* | | | | Merge branch '27756-fix-json-404-response' into 'master' | Clement Ho | 2017-02-08 | 1 | -0/+22 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ajax requests when current URL has a trailing slash Closes #27756 See merge request !9010 | ||||
| * | | | | Remove sleep from tests | Clement Ho | 2017-02-08 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Add tests27756-fix-json-404-response | Alfredo Sumaran | 2017-02-07 | 1 | -0/+24 |
| | | | | | |||||
* | | | | | Merge branch '27880-pipelines-table-not-showing-commit-branch' into 'master' | Clement Ho | 2017-02-08 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks for correct key to pass to commit prop. Adds rspec test. Closes #27880 See merge request !9070 | ||||
| * | | | | | Looks for correct key to pass to commit prop. Adds rspec test. | Filipa Lacerda | 2017-02-08 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Fixed random merge request widget failure | Phil Hughes | 2017-02-08 | 1 | -2/+0 |
|/ / / / / | |||||
* | | | | | Merge branch '26705-filter-todos-by-manual-add' into 'master' | Sean McGivern | 2017-02-08 | 1 | -7/+50 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Filter todos by manual add Closes #26705 See merge request !8861 | ||||
| * | | | | Filter todos by manual add | Jacopo | 2017-01-28 | 1 | -7/+50 |
| | | | | | | | | | | | | | | | | | | | | Added the option to filter todo by Added and Pipelines | ||||
* | | | | | Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master' | Fatih Acet | 2017-02-07 | 1 | -0/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix rendering pipelines for a new merge request See merge request !9032 | ||||
| * | | | | | Add feature spec for a new merge request with pipeline | Grzegorz Bizon | 2017-02-07 | 1 | -0/+20 |
| | | | | | | |||||
* | | | | | | Merge branch ↵ | Alfredo Sumaran | 2017-02-07 | 1 | -0/+100 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '23785-with-builds-tab-gone-give-additional-context-in-system-information-element-in-mr-commit-views-by-adding-mini-pipeline-graph' into 'master' added inline pipeline graph Closes #23785 See merge request !8576 | ||||
| * | | | | | | added inline pipeline graph23785-with-builds-tab-gone-give-additional-context-in-system-information-element-in-mr-commit-views-by-adding-mini-pipeline-graph | Luke "Jared" Bennett | 2017-02-07 | 1 | -0/+100 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests review changes | ||||
* | | | | | | Merge branch 'route-map' into 'master' | Robert Speicher | 2017-02-07 | 3 | -0/+140 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867 | ||||
| * | | | | | | Address feedback | Douwe Maan | 2017-02-06 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Add feature specs | Douwe Maan | 2017-02-06 | 5 | -34/+140 |
| | | | | | | | |||||
| * | | | | | | Add tests | Douwe Maan | 2017-02-06 | 6 | -0/+34 |
| | | | | | | | |||||
* | | | | | | | Merge branch ↵ | Clement Ho | 2017-02-07 | 2 | -19/+24 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25487-small-improvements-to-the-ui-of-mattermost-and-slack-command-services' into 'master' Resolve "Small improvements to the UI of Mattermost and Slack Command services" Closes #25487 See merge request !8491 | ||||
| * | | | | | | | Added small improvments to the chat slash command services | Luke "Jared" Bennett | 2017-02-07 | 2 | -19/+24 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Updated specs | ||||
* | | | | | | | Merge branch '24147-delete-env-button' into 'master' | Rémy Coutable | 2017-02-07 | 2 | -18/+46 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes stop button visible in environment page Closes #24147 See merge request !7379 | ||||
| * | | | | | | | Fix stop action24147-delete-env-button | Kamil Trzcinski | 2017-02-07 | 1 | -13/+3 |
| | | | | | | | | |||||
| * | | | | | | | Update changes | Kamil Trzcinski | 2017-02-06 | 1 | -18/+30 |
| | | | | | | | |