summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Ruby files that are not meant to be executable should be 644 not 755dz-fix-file-modeDmitriy Zaporozhets2017-05-151-0/+0
* 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
* | | | | | | | | Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-1271-314/+288
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge branch '31384-new-issue-button-on-no-results-page-after-search-doesn-t-...Annabel Dunstone Gray2017-05-121-1/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Remove 'New issue' button when issues search returns no results.Bryce Johnson2017-05-111-1/+0
* | | | | | | | Merge branch '32103-last-scheduled-pipeline-link-only-showing-ci-status-icon'...Kamil Trzciński2017-05-121-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add pipeline id to Last Pipeline cell link.32103-last-scheduled-pipeline-link-only-showing-ci-status-iconBryce Johnson2017-05-111-0/+1
* | | | | | | | | Merge branch 'update_assignee_cache_counts_refactoring' into 'master' Sean McGivern2017-05-125-16/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move update_assignee_cache_counts to the serviceValery Sizov2017-05-125-16/+13
* | | | | | | | | | Merge branch 'acet-mr-widget-fix-link' into 'master' Filipa Lacerda2017-05-124-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | MRWidget: Use targetBranchPath in everywhere.acet-mr-widget-fix-linkFatih Acet2017-05-123-3/+2
| * | | | | | | | | | MRWidget: Fix target branch link.Fatih Acet2017-05-123-2/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'protected-branches-no-one-merge' into 'master' Sean McGivern2017-05-123-28/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Style changes to Ruby fileprotected-branches-no-one-mergePhil Hughes2017-05-121-3/+7
| * | | | | | | | | | Enabled no-one as a merge access level in protected branchesPhil Hughes2017-05-103-28/+18
* | | | | | | | | | | Merge branch '32178-prevent-merge-on-sha-change' into 'master' Fatih Acet2017-05-126-0/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add sha-mismatch state to mr-widget to prevent accidental merges when branch ...Mike Greiling2017-05-116-0/+24
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Uniform CI status components in vueFilipa Lacerda2017-05-1211-261/+106
* | | | | | | | | | | Merge branch '32073-improve-function' into 'master' Phil Hughes2017-05-121-18/+13
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status