summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov2017-03-06261-326/+467
|\
| * Merge branch '27520-option-to-prevent-signing-in-from-multiple-ips' into 'mas...Sean McGivern2017-03-064-0/+43
| |\
| | * Make Warden set_user hook validate user ip uniqunessPawel Chojnacki2017-03-061-1/+1
| | * Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ...Pawel Chojnacki2017-03-063-8/+11
| | * Add admin settings entriesPawel Chojnacki2017-03-063-0/+35
| | * Allow limiting logging in users from too many different IPs.Pawel Chojnacki2017-03-062-4/+9
| * | Merge branch 'fix-mentioned-issues-for-external-trackers' into 'master' Sean McGivern2017-03-061-0/+5
| |\ \
| | * | Fix issues mentioned but not closed for JIRASean McGivern2017-03-061-0/+5
| * | | Merge branch '28704-fullscreen-zen-mode-is-broken' into 'master' Annabel Dunstone Gray2017-03-061-1/+2
| |\ \ \
| | * | | Set max for Zen mode textarea to screen height28704-fullscreen-zen-mode-is-brokenSam Rose2017-03-031-1/+2
| * | | | Merge branch '25503_issues_finder_performance' into 'master' Sean McGivern2017-03-063-14/+31
| |\ \ \ \
| | * | | | Improve issues filtering performanceJarka Kadlecova2017-03-063-14/+31
| * | | | | Merge branch 'second-nav-spacing-mobile' into 'master' Annabel Dunstone Gray2017-03-062-10/+20
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Changed the styling to allow bigger link targets on mobilesecond-nav-spacing-mobilePhil Hughes2017-03-061-3/+18
| | * | | | Fixed spacing in mobile secondary navPhil Hughes2017-03-022-9/+4
| * | | | | Merge branch 'introduce-pipeline-triggers' into 'master' Sean McGivern2017-03-064-6/+12
| |\ \ \ \ \
| | * | | | | Introduce tests for pipeline triggersKamil Trzcinski2017-03-051-2/+2
| | * | | | | Fix trigger modelKamil Trzcinski2017-03-051-1/+0
| | * | | | | Make triggers to be user awareKamil Trzcinski2017-03-052-1/+2
| | * | | | | Make Pipeline Triggers to be user awareKamil Trzcinski2017-03-051-3/+9
| * | | | | | Merge branch '1648-remove-remnants-of-git-annex-support' into 'master' Robert Speicher2017-03-061-5/+0
| |\ \ \ \ \ \
| | * | | | | | Remove remnants of git annexPawel Chojnacki2017-03-031-5/+0
| * | | | | | | Merge branch '26384-improve-omnibus-mattermost-command-installation-flow' int...Kamil Trzciński2017-03-065-12/+24
| |\ \ \ \ \ \ \
| | * | | | | | | Improved team selectionLuke "Jared" Bennett2017-03-055-12/+24
| * | | | | | | | Merge branch 'delete-pages' into 'master' Grzegorz Bizon2017-03-061-0/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Delete artifacts for pages unless expiry date is specifieddelete-pagesKamil Trzcinski2017-03-051-0/+2
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch '28898-fix-search-branches-in-cherry-picking' into 'master' Sean McGivern2017-03-061-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix json response in branches controllerGeorge Andrinopoulos2017-03-061-1/+1
| * | | | | | | | Merge branch 'etag-notes-polling' into 'master' Sean McGivern2017-03-064-3/+21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Invalidate ETag cache when note changesAdam Niedzielski2017-03-011-0/+13
| | * | | | | | | | Remove query parameters from notes polling endpoint to make caching easierAdam Niedzielski2017-03-013-3/+8
| * | | | | | | | | Merge branch '28655-current-path-text-is-not-updated-after-setting-the-new-us...Rémy Coutable2017-03-063-12/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update profiles/account view to display new usernameMark Fletcher2017-03-023-12/+8
| * | | | | | | | | | Remove .es6 from file extensions (!9241)winniehell2017-03-05179-0/+0
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'format-timeago-date' into 'master' Jacob Schatz2017-03-051-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Formats timeago dates to be more friendlyPhil Hughes2017-02-101-1/+1
| * | | | | | | | | | Merge branch 'commons-chunk-plugin' into 'master' Jacob Schatz2017-03-0528-51/+69
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | merge cropper library into profile_bundlecommons-chunk-pluginMike Greiling2017-03-033-8/+2
| | * | | | | | | | | | remove isolated common_vue inclusionMike Greiling2017-03-031-2/+0
| | * | | | | | | | | | rename application entry point and change manifest to runtimeMike Greiling2017-03-032-2/+2
| | * | | | | | | | | | create a cacheable commons bundle for d3 libraryMike Greiling2017-03-036-5/+6
| | * | | | | | | | | | merge lib_chart into graphs bundleMike Greiling2017-03-035-6/+2
| | * | | | | | | | | | create a cacheable commons bundle for our Vue bundlesMike Greiling2017-03-0311-4/+10
| | * | | | | | | | | | don't rely on global spaced Vue library for issuable bundleMike Greiling2017-03-031-0/+2
| | * | | | | | | | | | separate webpack runtime into its own chunk to maintain cacheability of commo...Mike Greiling2017-03-031-0/+1
| | * | | | | | | | | | refactor common bundle to ES module syntax and move global exports to applica...Mike Greiling2017-03-034-32/+43
| | * | | | | | | | | | create a common.js bundle and include all jQuery pluginsMike Greiling2017-03-035-17/+26
| * | | | | | | | | | | Merge branch 'dashboard-filter-search-keep-params' into 'master' Dmitriy Zaporozhets2017-03-0423-202/+218
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Improve projects/groups list js codedashboard-filter-search-keep-paramsDmitriy Zaporozhets2017-03-043-10/+14
| | * | | | | | | | | | | Removed empty options from URLPhil Hughes2017-03-031-1/+1