Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixed unhandled promise rejection | Phil Hughes | 2018-02-05 | 1 | -2/+1 |
| | |||||
* | fixed task list spec | Phil Hughes | 2018-02-05 | 2 | -15/+37 |
| | |||||
* | fixed notes_spec.js | Phil Hughes | 2018-02-05 | 1 | -1/+1 |
| | |||||
* | fixed failing karma specs caused by TaskList | Phil Hughes | 2018-02-05 | 5 | -76/+109 |
| | |||||
* | Converted right_sidebar.js to use axios | Phil Hughes | 2018-02-05 | 1 | -9/+13 |
| | |||||
* | Converted prometheus_metrics.js to use axios | Phil Hughes | 2018-02-05 | 1 | -18/+26 |
| | |||||
* | Merge branch 'refactor-ci-variable-list-for-future-usage-in-4110' into 'master' | Filipa Lacerda | 2018-02-02 | 4 | -145/+236 |
|\ | | | | | | | | | Refactor CI variable list code for usage with CI/CD settings page secret variables See merge request gitlab-org/gitlab-ce!16729 | ||||
| * | Refactor CI variable list code for usage with CI/CD settings page secret ↵refactor-ci-variable-list-for-future-usage-in-4110 | Eric Eastwood | 2018-01-31 | 4 | -145/+236 |
| | | | | | | | | | | | | variables Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110 | ||||
* | | Merge branch '24167__color_label' into 'master' | Douwe Maan | 2018-02-02 | 1 | -2/+11 |
|\ \ | | | | | | | | | | | | | | | | | | | Add Colors to GitLab Flavored Markdown Closes #24167 See merge request gitlab-org/gitlab-ce!16095 | ||||
| * | | Fix minors | Tony Rom | 2018-02-01 | 1 | -4/+4 |
| | | | |||||
| * | | Add Colors to GitLab Flavored Markdown | Tony Rom | 2018-01-29 | 1 | -0/+9 |
| | | | |||||
* | | | Merge branch 'ph-axios-2' into 'master' | Filipa Lacerda | 2018-02-02 | 7 | -324/+462 |
|\ \ \ | | | | | | | | | | | | | | | | | More conversions to axios See merge request gitlab-org/gitlab-ce!16800 | ||||
| * \ \ | Merge branch 'master' into ph-axios-2 | Phil Hughes | 2018-02-01 | 1 | -83/+48 |
| |\ \ \ | |||||
| * | | | | fixed axios mock not being restored | Phil Hughes | 2018-02-01 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | remove useless ajaxPost method | Phil Hughes | 2018-02-01 | 1 | -13/+0 |
| | | | | | |||||
| * | | | | fixed notes_spec.js | Phil Hughes | 2018-02-01 | 1 | -58/+124 |
| | | | | | |||||
| * | | | | fixed issue_spec transient failure | Phil Hughes | 2018-01-31 | 1 | -32/+27 |
| | | | | | |||||
| * | | | | fixed eslint :see_no_evil: | Phil Hughes | 2018-01-31 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' into ph-axios-2 | Phil Hughes | 2018-01-31 | 12 | -263/+375 |
| |\ \ \ \ | |||||
| * | | | | | fixed eslint | Phil Hughes | 2018-01-31 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Converted common_utils to axios | Phil Hughes | 2018-01-31 | 1 | -3/+5 |
| | | | | | | |||||
| * | | | | | Converted ajax_cache to axios | Phil Hughes | 2018-01-31 | 1 | -41/+28 |
| | | | | | | |||||
| * | | | | | fixed failing specs | Phil Hughes | 2018-01-31 | 4 | -27/+36 |
| | | | | | | |||||
| * | | | | | Converted merge_request_tabs.js to axios | Phil Hughes | 2018-01-30 | 1 | -30/+66 |
| | | | | | | |||||
| * | | | | | Converted job.js to axios | Phil Hughes | 2018-01-30 | 1 | -126/+137 |
| | | | | | | |||||
| * | | | | | Converted issue.js to axios | Phil Hughes | 2018-01-30 | 1 | -24/+58 |
| | | | | | | |||||
* | | | | | | Merge branch 'fl-mr-widget-1' into 'master' | Phil Hughes | 2018-02-02 | 2 | -124/+228 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves more mr widget components into vue files See merge request gitlab-org/gitlab-ce!16857 | ||||
| * | | | | | | Fixes after reviewfl-mr-widget-1 | Filipa Lacerda | 2018-02-01 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into fl-mr-widget-1 | Filipa Lacerda | 2018-02-01 | 6 | -152/+297 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (38 commits) Added more tests and corrected typos Ban Rugged from Repository Improve doc/development/automatic_ce_ee_merge.md fixed infinite loop crashing tests Converted todos.js to axios Converted usage_ping.js to use axios Converted pager.js to axios Converted notifications_form.js to axios Converted notes.js to axios Converted branch_graph.js to axios Converted mini_pipeline_graph_dropdown.js to axios Include subgroup issuables on the group page Remove grpc and google-protobuf platform-specific version markers in Gemfile.lock Replace $.ajax in find file with axios Replace $.ajax in activity calendar with axios Remove namespaced internationalization import Fix subgroup creation docs Fix a JSON schema that doesn't include enough fields Make user/author use project.creator in most factories Enable RuboCop Style/RegexpLiteral ... | ||||
| * | | | | | | | Transform `a` tag with button role into a `button` | Filipa Lacerda | 2018-02-01 | 1 | -5/+5 |
| | | | | | | | | |||||
| * | | | | | | | Moves widget header into a vue file | Filipa Lacerda | 2018-02-01 | 2 | -92/+209 |
| | | | | | | | | |||||
| * | | | | | | | Moves merge help into a vue component | Filipa Lacerda | 2018-01-31 | 1 | -35/+22 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'fl-mr-widget-2' into 'master' | Phil Hughes | 2018-02-02 | 2 | -79/+58 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves author components into vue files See merge request gitlab-org/gitlab-ce!16863 | ||||
| * | | | | | | | | Moves more mr widget components into vue filesfl-mr-widget-2 | Filipa Lacerda | 2018-02-01 | 2 | -79/+58 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'add-confirmation-input-for-modals' into 'master' | Clement Ho | 2018-02-01 | 1 | -0/+63 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add confirmation input component See merge request gitlab-org/gitlab-ce!16816 | ||||
| * | | | | | | | Add confirmation input component | Jose Ivan Vargas | 2018-02-01 | 1 | -0/+63 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'ph-axios-3' into 'master' | Filipa Lacerda | 2018-02-01 | 2 | -41/+113 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More conversions to axios See merge request gitlab-org/gitlab-ce!16848 | ||||
| * | | | | | | | fixed infinite loop crashing testsph-axios-3 | Phil Hughes | 2018-02-01 | 1 | -8/+13 |
| | | | | | | | | |||||
| * | | | | | | | Converted pager.js to axios | Phil Hughes | 2018-02-01 | 1 | -15/+61 |
| | | | | | | | | |||||
| * | | | | | | | Converted mini_pipeline_graph_dropdown.js to axios | Phil Hughes | 2018-02-01 | 1 | -26/+47 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch '35779-realtime-update-of-pipeline-status-in-files-view' into ↵ | Filipa Lacerda | 2018-02-01 | 1 | -0/+104 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Realtime update of pipeline status in Files view Closes #35779 See merge request gitlab-org/gitlab-ce!16523 | ||||
| * | | | | | | Added more tests and corrected typos35779-realtime-update-of-pipeline-status-in-files-view | Jose Ivan Vargas | 2018-02-01 | 1 | -27/+58 |
| | | | | | | | |||||
| * | | | | | | Added realtime prop and corrected specs | Jose Ivan Vargas | 2018-01-30 | 1 | -2/+7 |
| | | | | | | | |||||
| * | | | | | | Added pipeline status to the files view | Jose Ivan Vargas | 2018-01-30 | 1 | -0/+68 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'fl-mr-widget' into 'master' | Phil Hughes | 2018-01-31 | 1 | -83/+48 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Move mr widget related links into a vue file See merge request gitlab-org/gitlab-ce!16825 | ||||
| * | | | | | Move mr widget related links into a vue file | Filipa Lacerda | 2018-01-30 | 1 | -83/+48 |
| |/ / / / | |||||
* | | | | | Use axios instead of jquery ajax for setCiStatusFavicon | Clement Ho | 2018-01-31 | 2 | -28/+32 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'ph-ajax-to-axios' into 'master' | Filipa Lacerda | 2018-01-31 | 8 | -165/+141 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Converted $.ajax calls in some JS files to axios See merge request gitlab-org/gitlab-ce!16717 | ||||
| * | | | fixed failing specsph-ajax-to-axios | Phil Hughes | 2018-01-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | fixed more unhandled promise rejections | Phil Hughes | 2018-01-30 | 2 | -5/+13 |
| | | | |