summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-127-101/+115
* | | | | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-122-8/+23
|\ \ \ \ \ \
| * | | | | | Allow disabling usage ping in `gitlab.yml`Sean McGivern2017-05-112-8/+23
* | | | | | | Merge branch 'dz-project-list-cache-key' into 'master' Douwe Maan2017-05-122-2/+10
|\ \ \ \ \ \ \
| * | | | | | | Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-keyDmitriy Zaporozhets2017-05-123-7/+2
| * | | | | | | Add parent full path to project list cache keyDmitriy Zaporozhets2017-05-122-1/+14
* | | | | | | | Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-126-2/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Turn blob dependency links blueDouwe Maan2017-05-105-0/+25
| * | | | | | | | Extract generic parts of Gitlab::Diff::InlineDiffMarkerDouwe Maan2017-05-101-2/+2
* | | | | | | | | Merge branch 'dm-copy-mr-source-branch-as-gfm' into 'master' Sean McGivern2017-05-121-1/+10
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 'dm-copy-mr-source-branch-as-gfm'dm-copy-mr-source-branch-as-gfmDouwe Maan2017-05-12140-1547/+1525
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Satisfy ESlintDouwe Maan2017-05-121-3/+4
| * | | | | | | | | Paste a copied MR source branch name as code when pasted into a GFM formDouwe Maan2017-05-111-1/+9
* | | | | | | | | | Removed all instances of Object.assign by using es6 classes, also includes so...Luke "Jared" Bennett2017-05-125-212/+198
* | | | | | | | | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-125-37/+23
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Respond with 404 when metrics are not enabled or deployment_metrics is not im...Pawel Chojnacki2017-05-121-1/+3
| * | | | | | | | | Keep presentation logic in one place and remove unecessary arguments.Pawel Chojnacki2017-05-112-4/+4
| * | | | | | | | | Custom queries for prometheusPawel Chojnacki2017-05-115-35/+19