summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix up @DouweM reviewEric Eastwood2017-03-062-1/+4
|
* Fix wrong image src with cached gl-emoji and relative rootEric Eastwood2017-03-061-3/+14
|
* Fix up potential for build finish event to fire for wrong menuEric Eastwood2017-03-061-4/+3
|
* Fix up off index when reading canvas and something failedEric Eastwood2017-03-061-3/+6
|
* Fix up emoji not being next to autocomplete labelEric Eastwood2017-03-061-0/+7
| | | | | Fixing some preexisting issues (Safari) and some new issues (Windows Firefox)
* Fix emoji cut-off line-heightEric Eastwood2017-03-063-4/+3
| | | | | | | | Maintain emoji line-height in it's context to avoid cut-off, (Windows 10) http://i.imgur.com/xmdOLgv.png This also allows us to get rid of the small bodge for the cut-off in Safari
* Fix up `watch` alias lookup in FirefoxEric Eastwood2017-03-062-2/+3
| | | | | It was pulling https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/watch
* Use native unicode emojisEric Eastwood2017-03-0624-2247/+2777
| | | | | | | | | | | | | | | | | | | | - gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474
* Add emoji images (generated from `rake gemojione:sprite`)Eric Eastwood2017-03-061792-0/+0
|
* Merge branch 'cowbellerina-22562-todos-filters' into 'master' Annabel Dunstone Gray2017-03-064-11/+24
|\ | | | | | | | | | | | | Fix Sort dropdown reflow issue Closes #22562 See merge request !9728
| * Fix Sort dropdown reflow issueJarkko Tuunanen2017-03-064-11/+24
| | | | | | | | | | | | | | | | | | | | Make Sort dropdown behave the same as filters in narrower viewports. Adjust dropdowns to fit on the same line in worst-case scenario ("Oldest created" selected). Closes #22562 See merge request !9533
* | Merge branch 'remove-vendored-raphael-library' into 'master' Filipa Lacerda2017-03-066-432/+414
|\ \ | | | | | | | | | | | | Refactor network graph bundle to ES module syntax See merge request !9696
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make stuck builds detection more performant Closes #27523 See merge request !9025
| * | | 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 ↵Sean McGivern2017-03-064-0/+43
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' GitLab should have an option to prevent users from signing in from multiple IPs Closes #27520 See merge request !8998
| * | | Make Warden set_user hook validate user ip uniqunessPawel Chojnacki2017-03-061-1/+1
| | | | | | | | | | | | | | | | + rename shared context
| * | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ↵Pawel Chojnacki2017-03-063-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | review - cleanup formating in haml - clarify time window is in seconds - cleanup straneous chunks in db/schema - rename count_uniqe_ips to update_and_return_ips_count - other
| * | | 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 JIRA Closes #26028 See merge request !9687
| * | | | Fix issues mentioned but not closed for JIRASean McGivern2017-03-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ReferenceExtractor` would return an array of `ExternalIssue` objects, and then perform `Array#-` to remove the issues closed. `ExternalIssue`s had `==` defined, but not `hash` or `eql?`, which are used by `Array#-`.
* | | | | 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 height Closes #28704 See merge request !9667
| * | | | | 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 IssuableFinder performance Closes #25503 See merge request !9030
| * | | | | | Improve issues filtering performanceJarka Kadlecova2017-03-063-14/+31
| | | | | | |
* | | | | | | Merge branch 'second-nav-spacing-mobile' into 'master' Annabel Dunstone Gray2017-03-062-10/+20
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Fixed spacing in mobile secondary nav See merge request !9657
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the spacing was spread evenly across the width which lead to some weird spacing issues, more noticeable between the user avatar & the dropdown caret
* | | | | | | Merge branch 'introduce-pipeline-triggers' into 'master' Sean McGivern2017-03-064-6/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve pipeline triggers API See merge request !9713
| * | | | | | | 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
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - they can have owner, - they can be edited, - they have description, - you can take ownership of them
* | | | | | | Merge branch '1648-remove-remnants-of-git-annex-support' into 'master' Robert Speicher2017-03-061-5/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove remnants of git annex See merge request !9508
| * | | | | | | Remove remnants of git annexPawel Chojnacki2017-03-031-5/+0
| | | | | | | |
* | | | | | | | Merge branch '26384-improve-omnibus-mattermost-command-installation-flow' ↵Kamil Trzciński2017-03-065-12/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Improve Omnibus-Mattermost Command installation flow" See merge request !9257
| * | | | | | | | Improved team selectionLuke "Jared" Bennett2017-03-055-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Review changes
* | | | | | | | | Merge branch 'delete-pages' into 'master' Grzegorz Bizon2017-03-061-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Delete artifacts for pages unless expiry date is specified See merge request !9716
View Lorry Controller Status