Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'issue_32225' into 'master' | Robert Speicher | 2017-05-23 | 1 | -2/+8 |
|\ | | | | | | | | | Add transient head_pipeline_of to pipeline factories See merge request !11566 | ||||
| * | Add transient head_pipeline_of to pipeline factoriesissue_32225 | Felipe Artur | 2017-05-22 | 1 | -2/+8 |
| | | |||||
* | | Merge branch '32418-make-link-to-self-less-obvious' into 'master' | Fatih Acet | 2017-05-22 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Change links to issuable meta to black Closes #32418 See merge request !11505 | ||||
| * | | Fix specs32418-make-link-to-self-less-obvious | Annabel Dunstone Gray | 2017-05-19 | 1 | -1/+1 |
| |/ | |||||
* | | Show password field mask while editing service settings | Kushal Pandya | 2017-05-22 | 1 | -1/+1 |
|/ | |||||
* | Use same last commit widget on project homepage and tree viewdm-consistent-commit-widget | Douwe Maan | 2017-05-17 | 1 | -2/+2 |
| | |||||
* | Rename Personal Audit Log | Tim Zallmann | 2017-05-16 | 4 | -7/+7 |
| | |||||
* | Merge branch 'dm-wait-for-requests' into 'master' | Douwe Maan | 2017-05-12 | 1 | -2/+2 |
|\ | | | | | | | | | Wait for requests after each Spinach scenario instead of feature See merge request !11349 | ||||
| * | Wait for requests after each Spinach scenario instead of featuredm-wait-for-requests | Douwe Maan | 2017-05-12 | 1 | -2/+2 |
| | | |||||
* | | Merge branch '30975-fixed-top-nav-POC' into 'master' | Annabel Dunstone Gray | 2017-05-12 | 4 | -9/+13 |
|\ \ | |/ |/| | | | | | | | | | Add fixed positioning to top level navbar Closes #30975 See merge request !10751 | ||||
| * | Fix specs | Annabel Dunstone Gray | 2017-05-12 | 1 | -1/+1 |
| | | |||||
| * | Fix specs | Annabel Dunstone Gray | 2017-05-12 | 4 | -8/+12 |
| | | |||||
* | | Consistently use monospace font for commit SHAs and branch and tag names | Douwe Maan | 2017-05-12 | 2 | -32/+3 |
|/ | |||||
* | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵ | Robert Speicher | 2017-05-10 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063 | ||||
| * | Enable the Style/TrailingCommaInArguments cop | Rémy Coutable | 2017-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Load tree readme asynchronouslydm-async-tree-readme | Douwe Maan | 2017-05-10 | 4 | -0/+7 |
|/ | |||||
* | Merge branch 'issue_27168_2' into 'master' | Sean McGivern | 2017-05-09 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | Preloads head pipeline for each merge request Closes #27168 See merge request !10064 | ||||
| * | Fix Specs | Felipe Artur | 2017-05-08 | 1 | -0/+1 |
| | | |||||
* | | Merge request widget redesign | Fatih Acet | 2017-05-09 | 10 | -17/+55 |
|/ | |||||
* | Merge branch 'mia_backort' into 'master' | Jacob Schatz | 2017-05-05 | 4 | -6/+6 |
|\ | | | | | | | | | Backport of Multiple Assignees feature See merge request !11089 | ||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵ | Valery Sizov | 2017-05-05 | 10 | -39/+52 |
| |\ | | | | | | | | | | skip] | ||||
| * | | Backport of multiple_assignees_feature [ci skip] | Valery Sizov | 2017-05-04 | 4 | -6/+6 |
| | | | |||||
* | | | Merge branch 'issue-title-description-realtime' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Render Description Realtime :tada: Closes #25049 and #31355 See merge request !10865 | ||||
| * | | pass failed spinach spec | Regis | 2017-05-03 | 1 | -0/+1 |
| | | | |||||
* | | | 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 |
| | |