summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* added the rest of the stages to the controller and relevant specsJames Lopez2016-11-171-4/+32
* added cycle analytics events controller and started integration specJames Lopez2016-11-171-0/+34
* Added test events specs and logic. Also fixed some SQL and refactored the pip...James Lopez2016-11-171-1/+1
* add pipeline id to merge request metrics table. Also, updated the pipeline wo...James Lopez2016-11-173-3/+4
* Started refactoring stuff to add events to cycle analyticsJames Lopez2016-11-171-48/+1
* Merge branch 'fix/trace-patch-updated-at' into 'master' Kamil Trzciński2016-11-161-0/+5
|\
| * Update the updated_at of a build while patching the traceTomasz Maczukin2016-11-151-0/+5
* | Merge branch 'related-mr-labels' into 'master' Annabel Dunstone Gray2016-11-162-8/+33
|\ \
| * | Fix SCSS linter errors.Didem Acet2016-11-161-8/+9
| * | Added colored labels to related MR list.Didem Acet2016-11-162-8/+32
* | | Merge branch 'explicitly-disable-eslint-inline' into 'master' Alfredo Sumaran2016-11-16120-119/+121
|\ \ \
| * | | explicitly disable eslint inlineexplicitly-disable-eslint-inlineLuke "Jared" Bennett2016-11-15120-119/+121
| | |/ | |/|
* | | Merge branch '24496-fix-internal-api-project-lookup' into 'master' Sean McGivern2016-11-161-10/+0
|\ \ \
| * | | Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas2016-11-161-10/+0
| |/ /
* | | Merge branch 'patch-5' into 'master' Rémy Coutable2016-11-161-1/+1
|\ \ \
| * | | fix "Without projects" filterBen Bodenmiller2016-11-161-1/+1
* | | | Merge branch '23824-activity-page-does-not-show-commits-comments' into 'master' Robert Speicher2016-11-162-5/+5
|\ \ \ \
| * | | | Allow commit note to be visible if repo is visible23824-activity-page-does-not-show-commits-commentsRémy Coutable2016-11-162-5/+5
* | | | | Merge branch 'user-dropdown-multiple-requests-fix' into 'master' Fatih Acet2016-11-161-1/+1
|\ \ \ \ \
| * | | | | Stopped multiple requests with dropdownsuser-dropdown-multiple-requests-fixPhil Hughes2016-11-161-1/+1
| |/ / / /
* | | | | Merge branch 'issue-boards-counter-border-fix' into 'master' Fatih Acet2016-11-161-1/+1
|\ \ \ \ \
| * | | | | Fixed issue boards counter border when unauthorizedissue-boards-counter-border-fixPhil Hughes2016-11-161-1/+1
| |/ / / /
* | | | | Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan2016-11-165-16/+27
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-165-16/+27
* | | | | Merge branch '23117-search-for-a-filename-in-a-project' into 'master' Sean McGivern2016-11-166-39/+27
|\ \ \ \ \
| * | | | | Search for a filename in a project23117-search-for-a-filename-in-a-projectValery Sizov2016-11-166-39/+27
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-merge-request-screen-deleted-source-branch' into 'master' Sean McGivern2016-11-161-9/+12
|\ \ \ \ \
| * | | | | Do not create a MergeRequestDiff record when source branch is deletedfix-merge-request-screen-deleted-source-branchAdam Niedzielski2016-11-161-9/+12
| |/ / / /
* | | | | Merge branch 'rs-issue-24527' into 'master' Sean McGivern2016-11-161-25/+22
|\ \ \ \ \
| * | | | | Limit labels returned for a specific project as an administratorRobert Speicher2016-11-161-25/+22
| | |_|_|/ | |/| | |
* | | | | Merge branch 'setter-for-key' into 'master' Dmitriy Zaporozhets2016-11-161-3/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Use setter for key instead AR callbackSemyon Pupkov2016-11-161-3/+4
* | | | | Merge branch 'fix_navigation_bar_issuables_counters' into 'master' Rémy Coutable2016-11-162-2/+13
|\ \ \ \ \
| * | | | | Improve changes after MR review.Lucas Deschamps2016-11-161-2/+2
| * | | | | Navigation bar issuables counters reflects dashboard issuables countersLucas Deschamps2016-11-162-2/+13
| | |/ / / | |/| | |
* | | | | Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master' Rémy Coutable2016-11-163-2/+17
|\ \ \ \ \
| * | | | | Limit autocomplete to currently selected itemsAkram FARES2016-11-153-2/+17
* | | | | | Move issuable title form to a new partialRémy Coutable2016-11-163-52/+53
| |/ / / / |/| | | |
* | | | | Merge branch '22790-mention-autocomplete-avatar' into 'master' Alfredo Sumaran2016-11-154-10/+36
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | shows user avatar in mention autocomplete in editor22790-mention-autocomplete-avatarNur Rony2016-11-164-10/+36
* | | | | Merge branch '23584-triggering-builds-from-webhooks' into 'master' Rémy Coutable2016-11-152-3/+25
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add ref parameter for triggerring builds with gitlab webhook from other project.Dmitry Poray2016-11-152-3/+25
* | | | | Merge branch '24492-promise-polyfill' into 'master' Jacob Schatz2016-11-151-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Adds es6-promise polyfill24492-promise-polyfillFilipa Lacerda2016-11-151-0/+1
| | |/ / | |/| |
* | | | Merge branch 'darken-badge-hover' into 'master' Annabel Dunstone Gray2016-11-152-4/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Darken todo badge on hoverdarken-badge-hovertauriedavis2016-11-142-4/+6
* | | | Merge branch 'master-recursiveTree' into 'master' Douwe Maan2016-11-152-4/+22
|\ \ \ \
| * | | | Issue #4270: Recursive option for files through APIRebeca Méndez2016-11-122-4/+22
* | | | | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-155-1/+52
|\ \ \ \ \
| * | | | | Add button to delete all merged branchesToon Claes2016-11-095-1/+52