summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '32125-fix-link-to-note-in-diff' into 'master' Fatih Acet2017-05-164-62/+91
|\
| * Fix linking to resolved note in diff32125-fix-link-to-note-in-diffEric Eastwood2017-05-124-62/+91
* | Merge branch 'zj-pipeline-schedule-owner' into 'master' Kamil Trzciński2017-05-162-1/+15
|\ \
| * | Do not schedule pipelines if the user can'tZ.J. van de Weg2017-05-152-1/+15
* | | Merge branch '24373-warning-message-go-away' into 'master' Phil Hughes2017-05-161-3/+16
|\ \ \
| * | | Notes: Warning message should go away once resolvedJacopo2017-05-151-3/+16
* | | | Merge branch 'issue-boards-label-filtering' into 'master' Filipa Lacerda2017-05-161-1/+4
|\ \ \ \
| * | | | Fixed tests with params being wrongissue-boards-label-filteringPhil Hughes2017-05-151-1/+4
| * | | | Fixed issue boards not filtering when URL params are encodedPhil Hughes2017-05-121-1/+1
* | | | | Merge branch '31898-pipeline-table-alignment' into 'master' Filipa Lacerda2017-05-161-2/+1
|\ \ \ \ \
| * | | | | Remove extra pipeline margin31898-pipeline-table-alignmentAnnabel Dunstone Gray2017-05-101-2/+1
* | | | | | Merge branch 'omega-submodules' into 'master'Robert Speicher2017-05-151-0/+4
|\ \ \ \ \ \
| * | | | | | submodule_links: Handle in-repository submodule urlsDavid Turner2017-05-151-0/+4
* | | | | | | Merge branch '31902-namespace-recent-searches-to-project' into 'master' Annabel Dunstone Gray2017-05-153-4/+9
|\ \ \ \ \ \ \
| * | | | | | | Scope recent searches to projectEric Eastwood2017-05-153-4/+9
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"Douwe Maan2017-05-157-11/+11
* | | | | | | Merge branch '31106-tabs-alignment' into 'master' Annabel Dunstone Gray2017-05-155-54/+77
|\ \ \ \ \ \ \
| * | | | | | | fix Resolved Discussions counter wrapping to next lineSimon Knox2017-05-135-54/+77
* | | | | | | | Merge branch 'rename-rendered_title' into 'master' Rémy Coutable2017-05-153-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename all references to rendered_title to realtime_changesrename-rendered_titleLuke "Jared" Bennett2017-05-133-5/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' Douwe Maan2017-05-157-11/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename `build_events` to `job_events` in codeBob Van Landuyt2017-05-157-11/+11
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Improve slash command stripping, escape temporary note contentsKushal Pandya2017-05-151-2/+3
* | | | | | | | Merge branch '32184-retried-jobs' into 'master' Phil Hughes2017-05-152-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Use fa-refresh on retried jobs32184-retried-jobsAnnabel Dunstone Gray2017-05-122-2/+2
* | | | | | | | | Merge branch 'gitaly-reuse-stubs' into 'master' Robert Speicher2017-05-151-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't reuse gRPC channelsJacob Vosmaer2017-05-151-2/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '31886-remover-comment-load-spinner' into 'master' Annabel Dunstone Gray2017-05-151-3/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 31886 Remove spinner from loading comment31886-remover-comment-load-spinnertauriedavis2017-05-121-3/+0
* | | | | | | | | | MR zindex regressionLuke "Jared" Bennett2017-05-153-2/+4
* | | | | | | | | | Create a Users FinderGeorge Andrinopoulos2017-05-151-0/+74
* | | | | | | | | | Merge branch 'dz-fix-file-mode' into 'master' Douwe Maan2017-05-151-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Ruby files that are not meant to be executable should be 644 not 755dz-fix-file-modeDmitriy Zaporozhets2017-05-151-0/+0
* | | | | | | | | | Added balsamiq jasmine integration testLuke "Jared" Bennett2017-05-152-20/+36
* | | | | | | | | | Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master' Robert Speicher2017-05-141-2/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add support for deltas_only under GitalyAhmad Sherif2017-05-131-2/+10
* | | | | | | | | | Merge branch 'use-common-vue-for-pipeline-schedule-bundles' into 'master' Filipa Lacerda2017-05-142-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | ensure schedule_form and schedules_index both utilize common_vue bundleuse-common-vue-for-pipeline-schedule-bundlesMike Greiling2017-05-122-3/+4
* | | | | | | | | | Minor cosmetic fixes in hooks admin screenGabriel Mazetto2017-05-122-4/+4
* | | | | | | | | | Make the new repository_update_events configurable in System Hooks UIGabriel Mazetto2017-05-124-2/+13
* | | | | | | | | | Added repository_update hookGabriel Mazetto2017-05-123-3/+25
* | | | | | | | | | Merge branch '30975-fixed-top-nav-POC' into 'master' Annabel Dunstone Gray2017-05-1212-9/+40
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clean up fixed navbarAnnabel Dunstone Gray2017-05-123-6/+9
| * | | | | | | | | | Fix specsAnnabel Dunstone Gray2017-05-122-3/+4
| * | | | | | | | | | Fade out border on scrollAnnabel Dunstone Gray2017-05-124-11/+14
| * | | | | | | | | | Add animation to navbar borderAnnabel Dunstone Gray2017-05-121-2/+3
| * | | | | | | | | | Add nav border on scrollAnnabel Dunstone Gray2017-05-122-0/+15
| * | | | | | | | | | Remove trailing semicolonAnnabel Dunstone Gray2017-05-121-1/+1
| * | | | | | | | | | Add fixed positioning to top level navbarAnnabel Dunstone Gray2017-05-129-8/+16
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-127-101/+115
|\ \ \ \ \ \ \ \ \ \