summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Moves more mr widget components into vue filesfl-mr-widget-2Filipa Lacerda2018-02-019-137/+136
* Merge branch 'ph-axios-3' into 'master'Filipa Lacerda2018-02-019-151/+207
|\
| * fixed infinite loop crashing testsph-axios-3Phil Hughes2018-02-011-8/+13
| * Converted todos.js to axiosPhil Hughes2018-02-011-22/+15
| * Converted usage_ping.js to use axiosPhil Hughes2018-02-011-9/+10
| * Converted pager.js to axiosPhil Hughes2018-02-012-32/+77
| * Converted notifications_form.js to axiosPhil Hughes2018-02-011-19/+19
| * Converted notes.js to axiosPhil Hughes2018-02-011-20/+15
| * Converted branch_graph.js to axiosPhil Hughes2018-02-011-8/+8
| * Converted mini_pipeline_graph_dropdown.js to axiosPhil Hughes2018-02-012-41/+58
* | Merge branch 'ban-rugged-app-models' into 'master'Rémy Coutable2018-02-011-4/+1
|\ \
| * | Ban Rugged from Repositoryban-rugged-app-modelsJacob Vosmaer2018-02-011-4/+1
* | | Merge branch '35779-realtime-update-of-pipeline-status-in-files-view' into 'm...Filipa Lacerda2018-02-017-0/+280
|\ \ \
| * | | Added more tests and corrected typos35779-realtime-update-of-pipeline-status-in-files-viewJose Ivan Vargas2018-02-018-82/+131
| * | | Restored some code, add hidden classJose Ivan Vargas2018-01-304-19/+23
| * | | Added realtime prop and corrected specsJose Ivan Vargas2018-01-307-7/+44
| * | | Added changelogJose Ivan Vargas2018-01-301-0/+5
| * | | Added pipeline status to the files viewJose Ivan Vargas2018-01-307-17/+202
* | | | Merge branch '36009-user-default-project-creator-in-factories' into 'master'Robert Speicher2018-02-0124-33/+46
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix a JSON schema that doesn't include enough fieldsRémy Coutable2018-01-311-0/+4
| * | | Make user/author use project.creator in most factoriesRémy Coutable2018-01-3123-33/+42
* | | | Merge branch 'jramsay-42598-fix-subgroup-creation-docs' into 'master'Marcia Ramos2018-02-012-1/+2
|\ \ \ \
| * | | | Fix subgroup creation docsjramsay-42598-fix-subgroup-creation-docsJames Ramsay2018-01-312-1/+2
* | | | | Merge branch '41710-improve-automatic-ce-ee-merge-docs' into 'master'Sean McGivern2018-02-011-8/+23
|\ \ \ \ \
| * | | | | Improve doc/development/automatic_ce_ee_merge.mdRémy Coutable2018-02-011-8/+23
|/ / / / /
* | | | | Merge branch '30106-group-issues' into 'master'Sean McGivern2018-02-018-51/+200
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Include subgroup issuables on the group page30106-group-issuesJarka Kadlecová2018-02-018-51/+200
* | | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-0184-149/+156
|\ \ \ \ \
| * | | | | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-0184-149/+156
* | | | | | Merge branch 'fix-internationalization-namespace' into 'master'Filipa Lacerda2018-02-011-2/+2
|\ \ \ \ \ \
| * | | | | | Remove namespaced internationalization importfix-internationalization-namespaceClement Ho2018-01-311-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sh-remove-universal-darwin'Stan Hu2018-01-311-2/+2
|\ \ \ \ \ \
| * | | | | | Remove grpc and google-protobuf platform-specific version markers in Gemfile....Stan Hu2018-01-311-2/+2
* | | | | | | Merge branch 'qa-160' into 'master'Robert Speicher2018-02-012-2/+18
|\ \ \ \ \ \ \
| * | | | | | | Add a QA scenario for creating an issueqa-160Rémy Coutable2018-01-312-2/+18
* | | | | | | | Merge branch 'axios-find-file' into 'master'Fatih Acet2018-02-011-13/+11
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Replace $.ajax in find file with axiosaxios-find-fileClement Ho2018-01-311-13/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'axios-calendar' into 'master'Fatih Acet2018-01-311-9/+14
|\ \ \ \ \ \ \
| * | | | | | | Replace $.ajax in activity calendar with axiosaxios-calendarClement Ho2018-01-311-9/+14
| |/ / / / / /
* | | | | | | Merge branch 'repository-log-disable-walk' into 'master'Douwe Maan2018-01-313-63/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove Rugged::Walk implementation of #logrepository-log-disable-walkJacob Vosmaer2018-01-313-63/+2
* | | | | | | Merge branch '4761-follow-up-from-resolve-developers-should-be-able-to-create...Rémy Coutable2018-01-311-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | refactor groups controller to match EE4761-follow-up-from-resolve-developers-should-be-able-to-create-new-projects-in-groupJames Lopez2018-01-311-2/+2
* | | | | | | Merge branch 'fix-install-docs' into 'master'Nick Thomas2018-01-313-5/+10
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Fix example commands to refer to the correct versionsAlejandro Rodríguez2018-01-313-5/+10
|/ / / / / / /
* | | | | | | Merge branch 'fl-mr-widget' into 'master'Phil Hughes2018-01-315-122/+94
|\ \ \ \ \ \ \
| * | | | | | | Fix broken testfl-mr-widgetFilipa Lacerda2018-01-312-3/+3
| * | | | | | | Move mr widget related links into a vue fileFilipa Lacerda2018-01-305-123/+95
* | | | | | | | Merge branch 'axios-get-render-math' into 'master'Phil Hughes2018-01-311-13/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace $.get in render math with axiosaxios-get-render-mathClement Ho2018-01-301-13/+25
View Lorry Controller Status