Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixes after reviewfl-mr-widget-1 | Filipa Lacerda | 2018-02-01 | 2 | -12/+18 |
* | Merge branch 'master' into fl-mr-widget-1 | Filipa Lacerda | 2018-02-01 | 181 | -835/+1830 |
|\ | |||||
| * | Merge branch 'ph-axios-3' into 'master' | Filipa Lacerda | 2018-02-01 | 9 | -151/+207 |
| |\ | |||||
| | * | fixed infinite loop crashing testsph-axios-3 | Phil Hughes | 2018-02-01 | 1 | -8/+13 |
| | * | Converted todos.js to axios | Phil Hughes | 2018-02-01 | 1 | -22/+15 |
| | * | Converted usage_ping.js to use axios | Phil Hughes | 2018-02-01 | 1 | -9/+10 |
| | * | Converted pager.js to axios | Phil Hughes | 2018-02-01 | 2 | -32/+77 |
| | * | Converted notifications_form.js to axios | Phil Hughes | 2018-02-01 | 1 | -19/+19 |
| | * | Converted notes.js to axios | Phil Hughes | 2018-02-01 | 1 | -20/+15 |
| | * | Converted branch_graph.js to axios | Phil Hughes | 2018-02-01 | 1 | -8/+8 |
| | * | Converted mini_pipeline_graph_dropdown.js to axios | Phil Hughes | 2018-02-01 | 2 | -41/+58 |
| * | | Merge branch 'ban-rugged-app-models' into 'master' | Rémy Coutable | 2018-02-01 | 1 | -4/+1 |
| |\ \ | |||||
| | * | | Ban Rugged from Repositoryban-rugged-app-models | Jacob Vosmaer | 2018-02-01 | 1 | -4/+1 |
| * | | | Merge branch '35779-realtime-update-of-pipeline-status-in-files-view' into 'm... | Filipa Lacerda | 2018-02-01 | 7 | -0/+280 |
| |\ \ \ | |||||
| | * | | | Added more tests and corrected typos35779-realtime-update-of-pipeline-status-in-files-view | Jose Ivan Vargas | 2018-02-01 | 8 | -82/+131 |
| | * | | | Restored some code, add hidden class | Jose Ivan Vargas | 2018-01-30 | 4 | -19/+23 |
| | * | | | Added realtime prop and corrected specs | Jose Ivan Vargas | 2018-01-30 | 7 | -7/+44 |
| | * | | | Added changelog | Jose Ivan Vargas | 2018-01-30 | 1 | -0/+5 |
| | * | | | Added pipeline status to the files view | Jose Ivan Vargas | 2018-01-30 | 7 | -17/+202 |
| * | | | | Merge branch '36009-user-default-project-creator-in-factories' into 'master' | Robert Speicher | 2018-02-01 | 24 | -33/+46 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Fix a JSON schema that doesn't include enough fields | Rémy Coutable | 2018-01-31 | 1 | -0/+4 |
| | * | | | Make user/author use project.creator in most factories | Rémy Coutable | 2018-01-31 | 23 | -33/+42 |
| * | | | | Merge branch 'jramsay-42598-fix-subgroup-creation-docs' into 'master' | Marcia Ramos | 2018-02-01 | 2 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | Fix subgroup creation docsjramsay-42598-fix-subgroup-creation-docs | James Ramsay | 2018-01-31 | 2 | -1/+2 |
| * | | | | | Merge branch '41710-improve-automatic-ce-ee-merge-docs' into 'master' | Sean McGivern | 2018-02-01 | 1 | -8/+23 |
| |\ \ \ \ \ | |||||
| | * | | | | | Improve doc/development/automatic_ce_ee_merge.md | Rémy Coutable | 2018-02-01 | 1 | -8/+23 |
| |/ / / / / | |||||
| * | | | | | Merge branch '30106-group-issues' into 'master' | Sean McGivern | 2018-02-01 | 8 | -51/+200 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Include subgroup issuables on the group page30106-group-issues | Jarka Kadlecová | 2018-02-01 | 8 | -51/+200 |
| * | | | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master' | Rémy Coutable | 2018-02-01 | 84 | -149/+156 |
| |\ \ \ \ \ | |||||
| | * | | | | | Enable RuboCop Style/RegexpLiteral | Takuya Noguchi | 2018-02-01 | 84 | -149/+156 |
| * | | | | | | Merge branch 'fix-internationalization-namespace' into 'master' | Filipa Lacerda | 2018-02-01 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove namespaced internationalization importfix-internationalization-namespace | Clement Ho | 2018-01-31 | 1 | -2/+2 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'sh-remove-universal-darwin' | Stan Hu | 2018-01-31 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove grpc and google-protobuf platform-specific version markers in Gemfile.... | Stan Hu | 2018-01-31 | 1 | -2/+2 |
| * | | | | | | | Merge branch 'qa-160' into 'master' | Robert Speicher | 2018-02-01 | 2 | -2/+18 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add a QA scenario for creating an issueqa-160 | Rémy Coutable | 2018-01-31 | 2 | -2/+18 |
| * | | | | | | | | Merge branch 'axios-find-file' into 'master' | Fatih Acet | 2018-02-01 | 1 | -13/+11 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Replace $.ajax in find file with axiosaxios-find-file | Clement Ho | 2018-01-31 | 1 | -13/+11 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'axios-calendar' into 'master' | Fatih Acet | 2018-01-31 | 1 | -9/+14 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Replace $.ajax in activity calendar with axiosaxios-calendar | Clement Ho | 2018-01-31 | 1 | -9/+14 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'repository-log-disable-walk' into 'master' | Douwe Maan | 2018-01-31 | 3 | -63/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Remove Rugged::Walk implementation of #logrepository-log-disable-walk | Jacob Vosmaer | 2018-01-31 | 3 | -63/+2 |
| * | | | | | | | Merge branch '4761-follow-up-from-resolve-developers-should-be-able-to-create... | Rémy Coutable | 2018-01-31 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | refactor groups controller to match EE4761-follow-up-from-resolve-developers-should-be-able-to-create-new-projects-in-group | James Lopez | 2018-01-31 | 1 | -2/+2 |
| * | | | | | | | Merge branch 'fix-install-docs' into 'master' | Nick Thomas | 2018-01-31 | 3 | -5/+10 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ci skip] Fix example commands to refer to the correct versions | Alejandro Rodríguez | 2018-01-31 | 3 | -5/+10 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'fl-mr-widget' into 'master' | Phil Hughes | 2018-01-31 | 5 | -122/+94 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix broken testfl-mr-widget | Filipa Lacerda | 2018-01-31 | 2 | -3/+3 |
| | * | | | | | | | Move mr widget related links into a vue file | Filipa Lacerda | 2018-01-30 | 5 | -123/+95 |
| * | | | | | | | | Merge branch 'axios-get-render-math' into 'master' | Phil Hughes | 2018-01-31 | 1 | -13/+25 |
| |\ \ \ \ \ \ \ \ |