Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix propagate service spec transient failurefix/transient-service-template-spec | James Lopez | 2017-05-23 | 1 | -4/+8 |
| | |||||
* | Merge branch 'prevent-project-transfer' into 'master' | Douwe Maan | 2017-05-23 | 2 | -0/+45 |
|\ | | | | | | | | | | | | | Prevent project transfer if a new group is not selected Closes #25455 See merge request !11214 | ||||
| * | minor adjustments to the specs | Jose Ivan Vargas | 2017-05-22 | 2 | -11/+10 |
| | | |||||
| * | Renamed some messages and refactored the project_edit class to a function | Jose Ivan Vargas | 2017-05-22 | 2 | -2/+2 |
| | | |||||
| * | Prevent project transfer if a new group is not selected | Jose Ivan Vargas | 2017-05-22 | 2 | -0/+46 |
| | | |||||
* | | Merge branch 'handle-transient-mr-query-count-spec' into 'master' | Douwe Maan | 2017-05-22 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Handle transient MR query count spec See merge request !11571 | ||||
| * | | Handle transient MR query count spechandle-transient-mr-query-count-spec | Oswaldo Ferreira | 2017-05-19 | 1 | -1/+1 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | Merge branch 'adopt-es-module-syntax' into 'master' | Filipa Lacerda | 2017-05-22 | 54 | -150/+146 |
|\ \ \ | | | | | | | | | | | | | | | | | Adopt ES module syntax See merge request !9567 | ||||
| * | | | refactor instances of CJS module.exports to ES module syntax | Mike Greiling | 2017-05-16 | 2 | -6/+2 |
| | | | | |||||
| * | | | fix eslint failures | Mike Greiling | 2017-05-16 | 4 | -4/+4 |
| | | | | |||||
| * | | | fix implicit window object reference within gl_form_spec | Mike Greiling | 2017-05-16 | 1 | -6/+6 |
| | | | | |||||
| * | | | update test_bundle to use ES module syntax | Mike Greiling | 2017-05-16 | 1 | -6/+8 |
| | | | | |||||
| * | | | update frontend specs to use ES module syntax | Mike Greiling | 2017-05-16 | 51 | -131/+129 |
| | | | | |||||
* | | | | Merge branch 'change_pipelines_schedules_help_page_path' into 'master' | Rémy Coutable | 2017-05-22 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change pipelines schedules help page path See merge request !11592 | ||||
| * | | | | Change pipelines schedules help page pathchange_pipelines_schedules_help_page_path | Achilleas Pipinellis | 2017-05-22 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Respect the typo as rubocop said | Lin Jen-Shin | 2017-05-22 | 1 | -0/+0 |
| | | | | | |||||
* | | | | | Add a test to ensure this works on MySQL | Lin Jen-Shin | 2017-05-22 | 1 | -0/+17 |
|/ / / / | |||||
* | | | | Merge branch 'zj-pipeline-json-performance' into 'master' | Kamil Trzciński | 2017-05-21 | 1 | -5/+33 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve pipeline size for query limit test Closes #31906 See merge request !11323 | ||||
| * | | | | Improve pipeline size for query limit testzj-pipeline-json-performance | Z.J. van de Weg | 2017-05-17 | 1 | -5/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pipeline was quite meagre in both stages and the number of groups. This has been improved. Performance is not yet optimal, but to limit this from sliding further this slippery slope, a hard limit has been set. | ||||
* | | | | | Merge branch 'fix/gb/exclude-manual-actions-from-cancelable-jobs' into 'master' | Kamil Trzciński | 2017-05-21 | 1 | -0/+10 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Exclude manual actions when checking if pipeline can be canceled Closes #31107 See merge request !11562 | ||||
| * | | | | Exclude manual actions from cancelable jobs scopefix/gb/exclude-manual-actions-from-cancelable-jobs | Grzegorz Bizon | 2017-05-19 | 1 | -0/+10 |
| | | | | | |||||
* | | | | | Merge branch 'bvl-fix-already-renamed-paths' into 'master' | Douwe Maan | 2017-05-19 | 2 | -0/+95 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect renaming migrations Closes #32526 and #32530 See merge request !11515 | ||||
| * | | | | | Simpler way of renaming users | Bob Van Landuyt | 2017-05-19 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | Fix incorrectly renamed routes | Bob Van Landuyt | 2017-05-19 | 1 | -0/+73 |
| | | | | | | |||||
| * | | | | | Rename users that had their namespace renamed | Bob Van Landuyt | 2017-05-19 | 1 | -0/+19 |
| | | | | | | |||||
* | | | | | | Add users endpoint to frontend API class | Winnie Hellmann | 2017-05-19 | 1 | -0/+281 |
| | | | | | | |||||
* | | | | | | Merge branch 'fix-json-endpoint-redirection' into 'master' | Douwe Maan | 2017-05-19 | 1 | -0/+26 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix: don't redirect to JSON endpoints after sign in See merge request !11561 | ||||
| * | | | | | | Bugfix: don't redirect to JSON endpoints after sign in | Ruben Davila | 2017-05-19 | 1 | -0/+26 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch '32536-mr-widget-performance-improvements' into 'master' | Fatih Acet | 2017-05-19 | 5 | -9/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load improvements related to MR widget See merge request !11518 | ||||
| * | | | | | | Make sure fixture creation does not affect query count test32536-mr-widget-performance-improvements | Oswaldo Ferreira | 2017-05-19 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Remove route | Oswaldo Ferreira | 2017-05-19 | 1 | -5/+0 |
| | | | | | | | |||||
| * | | | | | | Fix Karma expect | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Stop loading MergeRequestEntity data on sidebar request | Oswaldo Ferreira | 2017-05-18 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Remove unnecessary initial request | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Drop merge_check endpoint and use only MR show instead | Oswaldo Ferreira | 2017-05-18 | 1 | -0/+9 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'fix-issue-32506' into 'master' | Douwe Maan | 2017-05-19 | 6 | -308/+608 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix redirects modifying the host Closes #32506 See merge request !11498 | ||||
| * | | | | | Refactor to more robust implementationfix-issue-32506 | Michael Kozono | 2017-05-19 | 4 | -9/+239 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to avoid string manipulation or modify route params (to make them unambiguous for `url_for`), we are accepting a behavior change: When being redirected to the canonical path for a group, if you requested a group show path starting with `/groups/…` then you’ll now be redirected to the group at root `/…`. | ||||
| * | | | | | Fix ensure_canonical_path for top level routes | Michael Kozono | 2017-05-18 | 3 | -312/+369 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don’t replace a substring of the path if it is part of the top level route. E.g. When redirecting from `/groups/ups` to `/groups/foo`, be careful not to do `/grofoo/ups`. Projects are unaffected by this issue, but I am grouping the `#ensure_canonical_path` tests similar to the group and user tests. | ||||
| * | | | | | Add test that fails without the fix | Michael Kozono | 2017-05-18 | 1 | -0/+13 |
| | | | | | | |||||
* | | | | | | Refine MR widget styling for buttons and info text | Kushal Pandya | 2017-05-19 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵ | Filipa Lacerda | 2017-05-19 | 2 | -4/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532 | ||||
| * | | | | | | Fix system note comparison and standardize note setup | Eric Eastwood | 2017-05-19 | 2 | -4/+21 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551 | ||||
* | | | | | | Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty31933-improve-rspec-profiling-enabling | Rémy Coutable | 2017-05-19 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | Fixes the 500 for custom apearance header logo and logo | Alexis Reigel | 2017-05-19 | 1 | -0/+40 |
| | | | | | |||||
* | | | | | Merge branch 'dm-fix-readme-project-view' into 'master' | Dmitriy Zaporozhets | 2017-05-19 | 1 | -1/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove readme project_view option See merge request !11425 | ||||
| * | | | | | Remove readme project_view option | Douwe Maan | 2017-05-19 | 1 | -1/+6 |
| | | | | | | |||||
* | | | | | | Merge branch 'user-avatar-vue-ce' into 'master' | Phil Hughes | 2017-05-19 | 8 | -6/+139 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate user avatar Vue logic Closes #31017 See merge request !10718 | ||||
| * | | | | | Fixes per feedback on user avatar components. | Bryce Johnson | 2017-05-18 | 4 | -69/+12 |
| | | | | | |