summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cowbellerina-22562-todos-filters' into 'master' Annabel Dunstone Gray2017-03-064-11/+24
|\
| * Fix Sort dropdown reflow issueJarkko Tuunanen2017-03-064-11/+24
* | Merge branch 'remove-vendored-raphael-library' into 'master' Filipa Lacerda2017-03-066-432/+414
|\ \
| * | remove unnecessary IIFEremove-vendored-raphael-libraryMike Greiling2017-03-051-12/+10
| * | refactor Network classMike Greiling2017-03-052-18/+15
| * | refactor BranchGraph classMike Greiling2017-03-054-392/+388
| * | remove manually vendored raphael library in favor of node moduleMike Greiling2017-03-051-9/+0
| * | merge raphael library into the network bundleMike Greiling2017-03-052-2/+2
* | | Merge branch '27523-make-stuck-build-detection-more-performant' into 'master' Kamil Trzciński2017-03-062-19/+59
|\ \ \
| * | | Renable StuckCiBuildsWorker to StucjCiJobsWorker27523-make-stuck-build-detection-more-performantTomasz Maczukin2017-03-031-1/+1
| * | | Make 'joins' line shorterTomasz Maczukin2017-03-011-1/+1
| * | | Fix rubocop offensesTomasz Maczukin2017-03-011-5/+2
| * | | Add minor updatesTomasz Maczukin2017-03-011-5/+13
| * | | Improve builds search queryTomasz Maczukin2017-03-011-1/+1
| * | | Add Gitlab::OptimisticLocking for build droppingTomasz Maczukin2017-03-011-1/+3
| * | | Add exclusive lease for stuck_ci_builds_workerTomasz Maczukin2017-03-011-2/+11
| * | | Update stuck and outdated builds cleanup workerTomasz Maczukin2017-03-011-7/+31
* | | | 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
| |_|_|/ / / / / / / |/| | | | | | | | |