Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add instant comments support | Kushal Pandya | 2017-05-05 | 2 | -0/+11 |
| | |||||
* | Merge branch 'deploy-keys-load-async' into 'master' | Filipa Lacerda | 2017-05-04 | 2 | -7/+15 |
|\ | | | | | | | | | | | | | Deploy keys load async Closes #29667 See merge request !10973 | ||||
| * | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-05-04 | 6 | -20/+34 |
| |\ | |||||
| * \ | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-05-03 | 11 | -13/+26 |
| |\ \ | |||||
| * | | | Fixed some spinach & rspec tests | Phil Hughes | 2017-04-28 | 2 | -7/+15 |
| | | | | |||||
* | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' | Sean McGivern | 2017-05-04 | 2 | -12/+6 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Use blob viewer for job artifacts Closes #31297 See merge request !11018 | ||||
| * | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewer | Douwe Maan | 2017-05-04 | 2 | -12/+6 |
| | | | | |||||
* | | | | Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master' | Rémy Coutable | 2017-05-04 | 4 | -20/+20 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Disable navigation to Pages config if Pages is disabled Closes #30529 See merge request !11008 | ||||
| * | | | Disable navigation to Pages config if Pages is disabled | Mark Fletcher | 2017-05-04 | 4 | -20/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Regards project-level pages config - Nav link is now shown only if Pages is enabled for instance - Navigation to following controllers denied if Pages disabled: * projects/pages_controller * projects/pages_domains_controller - 'disabled' partial removed + Test for pages_controller introduced | ||||
* | | | | Merge branch 'dm-artifact-browser-header' into 'master' | Robert Speicher | 2017-05-03 | 2 | -0/+14 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Add breadcrumb, build header and pipelines submenu to artifacts browser See merge request !11050 | ||||
| * | | | Add breadcrumb, build header and pipelines submenu to artifacts browser | Douwe Maan | 2017-05-03 | 2 | -0/+14 |
| | | | | |||||
* | | | | Merge branch 'async-milestone-tabs' into 'master' | Jacob Schatz | 2017-05-03 | 4 | -8/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Load milestone tabs asynchronously See merge request !10919 | ||||
| * | | | | Fixed spinach tests | Phil Hughes | 2017-04-26 | 4 | -8/+7 |
| | | | | | | | | | | | | | | | | | | | | Removed a spinach test as it wasn't actually testing what it said it should be | ||||
* | | | | | Merge branch '29836-try-waiting-for-ajax-in-addition-to-requests' into 'master' | Sean McGivern | 2017-05-03 | 1 | -1/+8 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Wait for AJAX requests at the JS level in addition to wait for requests at the middleware level Closes #29836 See merge request !10688 | ||||
| * | | | | Ensure Spinach features with JS waits for requests to complete29836-try-waiting-for-ajax-in-addition-to-requests | Rémy Coutable | 2017-04-26 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | Show Raw button as Download for binary files | Douwe Maan | 2017-04-30 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Use blob viewers for snippets | Douwe Maan | 2017-04-30 | 4 | -2/+9 |
| |_|/ / |/| | | | |||||
* | | | | Pull preserve into render helpers | Douwe Maan | 2017-04-28 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Fix feature specs | Douwe Maan | 2017-04-27 | 5 | -2/+28 |
| | | | |||||
* | | | Merge branch '31439-fix-transient-spinach-failures' into 'master' | Sean McGivern | 2017-04-26 | 1 | -0/+5 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Wait for AJAX after steps defined in SharedActiveTab Closes #31439 See merge request !10935 | ||||
| * | | Wait for AJAX after steps defined in SharedActiveTab31439-fix-transient-spinach-failures | Rémy Coutable | 2017-04-26 | 1 | -0/+5 |
| |/ | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Don't expect underlying DB data to be updated in feature spec | Rémy Coutable | 2017-04-26 | 1 | -2/+1 |
|/ | | | | | | | Only assert that the page shows something, this waits for requests to be completed. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Fix scoping issues with Spinach tests (e.g. ↵sh-fix-spinach-5-10-tests | Stan Hu | 2017-04-24 | 1 | -1/+1 |
| | | | | https://gitlab.com/gitlab-org/gitlab-ce/builds/14929499) | ||||
* | Merge branch 'rs-rename-login_as' into 'master' | Rémy Coutable | 2017-04-24 | 7 | -13/+70 |
|\ | | | | | | | | | Except where necessary, use `sign_in` over `login_as` in features See merge request !10320 | ||||
| * | Except where necessary, use `sign_in` over `login_as` in features | Robert Speicher | 2017-04-19 | 7 | -13/+70 |
| | | |||||
* | | Adding animation for all dropdown | Nur Rony | 2017-04-21 | 2 | -3/+5 |
| | | |||||
* | | Add Fork/Cancel confirmation to "Replace"/"Delete" buttons30637-replace-delete-buttons-get-fork-cancel-confirmation | Eric Eastwood | 2017-04-20 | 2 | -1/+4 |
| | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30637 | ||||
* | | Merge branch 'dz-refactor-create-members' into 'master' | Douwe Maan | 2017-04-20 | 4 | -192/+4 |
|\ \ | | | | | | | | | | | | | Refactor code that creates and destroys project/group members See merge request !10735 | ||||
| * | | Move some project/group members spinach tests to rspecdz-refactor-create-members | Dmitriy Zaporozhets | 2017-04-17 | 4 | -192/+4 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Refactor changing files in web UI | Douwe Maan | 2017-04-20 | 3 | -4/+6 |
| |/ |/| | |||||
* | | Add renderNote animation and added spec | Luke "Jared" Bennett | 2017-04-19 | 2 | -17/+0 |
| | | |||||
* | | Added profile name to user dropdown | Dimitrie Hoekstra | 2017-04-19 | 1 | -2/+2 |
| | | |||||
* | | Removes `Repository#version` method and testsdz-remove-repo-version | Dmitriy Zaporozhets | 2017-04-17 | 1 | -6/+0 |
|/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Clear emoji search in awards menu after picking emoji27655-clear-emoji-search-after-selection | Eric Eastwood | 2017-04-13 | 1 | -3/+3 |
| | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27655 | ||||
* | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-07 | 2 | -1/+10 |
|\ | |||||
| * | Merge branch 'dm-wait-for-pipeline' into 'master' | Stan Hu | 2017-04-07 | 1 | -0/+9 |
| |\ | | | | | | | | | | | | | | | | | | | Wait for AJAX requests to complete so they don't blow up if they are only handle… Closes #30633 See merge request !10559 | ||||
| | * | Actually include WaitForAjax! | Douwe Maan | 2017-04-07 | 1 | -0/+1 |
| | | | |||||
| | * | Wait for AJAX requests to complete so they don't blow up if they are only ↵ | Douwe Maan | 2017-04-07 | 1 | -0/+8 |
| | | | | | | | | | | | | handled after DatabaseCleaner has already run | ||||
| * | | Put back usernames in activity and profile feed | Annabel Dunstone Gray | 2017-04-07 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Update project build status cache when transitioning | Bob Van Landuyt | 2017-04-07 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 21 | -55/+67 |
|\ \ | |/ | |||||
| * | Merge branch 'menu-shortcut' into 'master' | Jacob Schatz | 2017-04-06 | 2 | -3/+3 |
| |\ | | | | | | | | | | | | | | | | | | | Add keyboard shortcuts to main menu. Closes #30036 See merge request !10243 | ||||
| | * | Fix broken spinach test | Filipa Lacerda | 2017-04-06 | 1 | -2/+2 |
| | | | |||||
| | * | Fix shortcut specs | Annabel Dunstone Gray | 2017-04-06 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed button capitalisation for Projects in views | Jose Ivan Vargas Lopez | 2017-04-06 | 15 | -36/+48 |
| | | | |||||
| * | | Fix rspec and spinach tests | Jose Ivan Vargas | 2017-04-06 | 3 | -12/+12 |
| | | | |||||
| * | | Groups section capitalization fix | Jose Ivan Vargas Lopez | 2017-04-06 | 1 | -2/+2 |
| | | | |||||
| * | | Dashboard section capitalization fix | Jose Ivan Vargas Lopez | 2017-04-06 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-06 | 5 | -4/+18 |
|\ \ | |/ | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml |