summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into 'mas...Douwe Maan2018-07-172-2/+2
|\
| * Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_urlSean McGivern2018-07-06703-4360/+10215
| |\
| * | Add base class for hook builders, and use it for notes and wikisSean McGivern2018-06-202-6/+2
| * | Passing absolute image urls in the markdown content in the webhooksSatish Perala2018-06-202-2/+6
* | | Resolve "MR: Reduce the memory footprint of the component tree"Tim Zallmann2018-07-1714-142/+148
* | | Merge branch 'add-merge-request-header-branch-details-right-margin' into 'mas...Annabel Gray2018-07-171-0/+1
|\ \ \
| * | | Add merge request header branch actions left marginGeorge Tsiolis2018-07-171-0/+1
* | | | 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
| |/ / /
* | | | 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-172-15/+1
|\ \ \ \
| * | | | Remove sanitize_repo_pathZeger-Jan van de Weg2018-07-172-15/+1
* | | | | Merge branch 'close-revert-and-cherry-pick-modal-on-escape-keypress' into 'ma...Rémy Coutable2018-07-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Close revert and cherry-pick modal on escape keypressGeorge Tsiolis2018-07-171-1/+1
| |/ / /
* | | | Merge branch 'gitaly-issue-cross-reference' into 'master'Sean McGivern2018-07-171-0/+1
|\ \ \ \
| * | | | Add cross-link to N+1 issueJacob Vosmaer2018-07-171-0/+1
* | | | | Merge branch '14995-custom_wiki_sidebar' into 'master'Sean McGivern2018-07-173-4/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-1649-287/+283
| |\ \ \ \
| * | | | | Always show More PagesLin Jen-Shin2018-07-131-4/+3
| * | | | | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-13446-3326/+5593
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into 14995-c...Andreas Kämmerle2018-07-02202-2518/+3309
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-06-272099-20684/+46452
| |\ \ \ \ \ \ \
| * | | | | | | | Introduce #find_sidebar and use a constant to find the page14995-custom_wiki_sidebarLin Jen-Shin2018-03-262-1/+8
| * | | | | | | | Avoid loading default sidebar if there's a customized oneLin Jen-Shin2018-03-261-2/+5
| * | | | | | | | Added support for custom wiki sidebar using _sidebar.md in the wiki root. If ...Joshua Sooter2018-03-232-5/+10
* | | | | | | | | Migrate merge base, merged branches, write refJacob Vosmaer (GitLab)2018-07-171-4/+6
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge branch 'fix-project-api-archived' into 'master'Rémy Coutable2018-07-161-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix archived parameter for projects APIMarko, Peter2018-07-161-1/+2
* | | | | | | | | Merge branch '49291-fix-memory-graph-component-typo' into 'master'Filipa Lacerda2018-07-161-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix `transform` typoKushal Pandya2018-07-161-1/+1
* | | | | | | | | | Merge branch '49061-submodule-helper-fix' into 'master'Sean McGivern2018-07-161-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SubmoduleHelper - Project is not always available as an instance variable49061-submodule-helper-fixMario de la Ossa2018-07-151-4/+4
* | | | | | | | | | | Merge branch 'frozen-string-enable-app-services' into 'master'Rémy Coutable2018-07-1647-13/+114
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Enable frozen string in apps/uploaders/*.rbgfyoung2018-07-1647-13/+114
* | | | | | | | | | | i18n: externalize strings from 'app/views/import'Tao Wang2018-07-1614-163/+138
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '48745-project-exports-fail-when-uploads-have-been-migrated-to-o...Sean McGivern2018-07-162-5/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use fileuploader dynamic path method in uploads manager and add spec48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storageJames Lopez2018-07-131-2/+6
| * | | | | | | | | | refactor uploads managerJames Lopez2018-07-111-3/+3
* | | | | | | | | | | Merge branch 'fix/gb/rename-environments-stop-actions' into 'master'Kamil Trzciński2018-07-166-10/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove unused `stop_action?` method from deployment classfix/gb/rename-environments-stop-actionsGrzegorz Bizon2018-07-121-4/+0
| * | | | | | | | | | | Rename environments stop action methodGrzegorz Bizon2018-07-125-6/+7
* | | | | | | | | | | | Merge branch 'i18n-extract-app/views/doorkeeper' into 'master'Rémy Coutable2018-07-1611-60/+51
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | i18n: externalize strings from 'app/views/doorkeeper'Tao Wang2018-07-1311-60/+51
* | | | | | | | | | | | | Merge branch 'mk/fix-flaky-protected-branch-expectations' into 'master'Rémy Coutable2018-07-162-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove flaky and redundant expectationsmk/fix-flaky-protected-branch-expectationsMichael Kozono2018-07-132-2/+2
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '48673-lazy-load-performance-bar-in-frontend' into 'master'Mike Greiling2018-07-132-29/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Lazy-load performance bar UI48673-lazy-load-performance-bar-in-frontendSean McGivern2018-07-132-29/+31
* | | | | | | | | | | | Merge branch 'ide-merge-requests-forks' into 'master'Filipa Lacerda2018-07-135-11/+29
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fixed test to correctly text relative URLside-merge-requests-forksPhil Hughes2018-07-131-6/+5
| * | | | | | | | | | | | Allow merge requests from forks to be opened in Web IDEPhil Hughes2018-07-125-10/+29