summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix fixtures for developmentShinya Maeda2018-07-181-2/+6
* Merge branch 'artifact-format-v2' into artifact-format-v2-with-parserShinya Maeda2018-07-181-1/+3
|\
| * Merge branch 'master' into artifact-format-v2Shinya Maeda2018-07-18329-1149/+2440
| |\
| * | Evaluate artifact_formatShinya Maeda2018-07-181-1/+3
* | | Merge branch 'master-ce' into artifact-format-v2-with-parserShinya Maeda2018-07-18329-1149/+2440
|\ \ \ | | |/ | |/|
| * | Merge branch 'jivl-dev-master-into-com-master' into 'master'Felipe Artur2018-07-174-1/+36
| |\ \
| | * \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jivl-dev-master-...jivl-dev-master-into-com-masterJose2018-07-174-1/+36
| | |\ \ | |/ / /
| | * | Merge branch 'fix-issue-49133' into 'master'José Iván Vargas López2018-07-173-1/+14
| | |\ \
| | | * | Rename WHITELISTED_FILENAMES => IGNORED_FILENAMESStan Hu2018-07-171-2/+2
| | | * | Fix symlink vulnerability in project importStan Hu2018-07-173-1/+14
| | * | | Update CHANGELOG.md for 10.7.7GitLab Release Tools Bot2018-07-171-0/+7
| | * | | Update CHANGELOG.md for 10.8.6GitLab Release Tools Bot2018-07-171-0/+8
| | * | | Update CHANGELOG.md for 11.0.4GitLab Release Tools Bot2018-07-171-0/+7
| * | | | Merge branch '48804-redesign-gcp-banner' into 'master'Mike Greiling2018-07-175-48/+28
| |\ \ \ \
| | * | | | Resolve "Redesign GCP banner"Taurie Davis2018-07-175-48/+28
| |/ / / /
| * | | | Merge branch '49257-metrics-drop-down-doesn-t-show-all-environment-some-not-c...Clement Ho2018-07-173-3/+30
| |\ \ \ \
| | * | | | Resolve "Metrics drop down doesn't show all environment, some not clickable"Jose Ivan Vargas2018-07-173-3/+30
| |/ / / /
| * | | | Merge branch 'fix-web-ide-header-button-background' into 'master'Filipa Lacerda2018-07-171-0/+1
| |\ \ \ \
| | * | | | Fix ide-tree-header button backgroundPaul Slaughter2018-07-171-0/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'extract-ee-specific-banzai-filters' into 'master'Robert Speicher2018-07-173-10/+28
| |\ \ \ \
| | * | | | Extract EE-specific lines from Banzai pipelinesextract-ee-specific-banzai-filtersSean McGivern2018-07-133-10/+28
| * | | | | Merge branch 'frozen-string-enable-apps-services-inner' into 'master'Rémy Coutable2018-07-17101-3/+208
| |\ \ \ \ \
| | * | | | | Enable frozen string in apps/services/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-innergfyoung2018-07-16101-3/+208
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'update-specific-runners-help-url' into 'master'Clement Ho2018-07-173-11/+14
| |\ \ \ \ \
| | * | | | | Update specific runners help URLGeorge Tsiolis2018-07-173-11/+14
| |/ / / / /
| * | | | | Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into 'mas...Douwe Maan2018-07-1716-41/+258
| |\ \ \ \ \
| | * | | | | Keep #absolute_image_urls as a private instance methodSean McGivern2018-07-172-9/+13
| | * | | | | Simplify WikiPage#hook_attrs specSean McGivern2018-07-171-6/+4
| | * | | | | Clarify web hook image rewriting doc exampleSean McGivern2018-07-171-2/+2
| | * | | | | Don't include a double slash when rewriting the URLSean McGivern2018-07-061-1/+4
| | * | | | | Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_urlSean McGivern2018-07-061929-33482/+64436
| | |\ \ \ \ \
| | * | | | | | Add documentation and specs for webhook URL rewritingSean McGivern2018-07-067-32/+139
| | * | | | | | Add base class for hook builders, and use it for notes and wikisSean McGivern2018-06-2010-45/+95
| | * | | | | | Fix hook data specsSean McGivern2018-06-204-11/+12
| | * | | | | | Fix MR hook builderSean McGivern2018-06-201-1/+1
| | * | | | | | Removing the empty line at the class body beginningSatish Perala2018-06-201-1/+0
| | * | | | | | Checking for the presense of markdown textSatish Perala2018-06-201-1/+5
| | * | | | | | Passing absolute image urls in the markdown content in the webhooksSatish Perala2018-06-209-2/+53
| * | | | | | | Merge branch '48964-mr-reduce-the-memory-footprint-of-the-component-tree' int...Fatih Acet2018-07-1718-145/+170
| |\ \ \ \ \ \ \
| | * | | | | | | Resolve "MR: Reduce the memory footprint of the component tree"Tim Zallmann2018-07-1718-145/+170
| |/ / / / / / /
| * | | | | | | Merge branch 'add-merge-request-header-branch-details-right-margin' into 'mas...Annabel Gray2018-07-172-0/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Add merge request header branch actions left marginGeorge Tsiolis2018-07-172-0/+6
| * | | | | | | | Merge branch '49165-pipeline-graph-in-new-merge-request-widget-is-flickering'...Annabel Gray2018-07-172-1/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix MR widget ci status icon tooltip flicker49165-pipeline-graph-in-new-merge-request-widget-is-flickeringClement Ho2018-07-162-1/+3
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'person-tags-better' into 'master'Annabel Gray2018-07-172-7/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Highlighting of person mentions now better visible on low contrast screens an...Dimitrie Hoekstra2018-07-172-7/+3
| |/ / / / / / / /
| * | | | | | | | Merge branch 'zj-remove-sanitize-repo-path' into 'master'Sean McGivern2018-07-173-42/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove sanitize_repo_pathZeger-Jan van de Weg2018-07-173-42/+1
| * | | | | | | | | Merge branch 'qa-48464-add-edit-delete-file-scenario' into 'master'44127-board-label-edit-drop-down-is-showing-incorrect-selected-labels-summaryRémy Coutable2018-07-178-2/+197
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | QA scenario to add/edit/delete a file via the Web UISanad Liaquat2018-07-178-2/+197
| |/ / / / / / / / /
View Lorry Controller Status