Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use gitaly 0.97.0gitaly-0.97.0 | Jacob Vosmaer | 2018-04-19 | 1 | -1/+1 |
* | Merge branch 'ide-diff-marker-cache-fix' into 'master' | Tim Zallmann | 2018-04-19 | 7 | -43/+123 |
|\ | |||||
| * | fixed spec with checking cached events | Phil Hughes | 2018-04-11 | 1 | -1/+1 |
| * | Fixed IDE diff markers being cached too long | Phil Hughes | 2018-04-11 | 6 | -42/+122 |
* | | Merge branch 'ide-staged-changes' into 'master' | Tim Zallmann | 2018-04-19 | 45 | -345/+1442 |
|\ \ | |||||
| * \ | Merge branch 'master' into ide-staged-changes | Phil Hughes | 2018-04-19 | 78 | -474/+959 |
| |\ \ | |||||
| * | | | fixed prop name in specs | Phil Hughes | 2018-04-18 | 2 | -2/+2 |
| * | | | updates to variable names to make more sense | Phil Hughes | 2018-04-18 | 8 | -38/+37 |
| * | | | Merge branch 'master' into ide-staged-changes | Phil Hughes | 2018-04-18 | 230 | -1440/+5845 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into ide-staged-changes | Phil Hughes | 2018-04-17 | 577 | -5208/+7904 |
| |\ \ \ \ | |||||
| * | | | | | correctly dispose cached models | Phil Hughes | 2018-04-11 | 2 | -1/+36 |
| * | | | | | fixed karma specs with change in icon name | Phil Hughes | 2018-04-09 | 2 | -2/+2 |
| * | | | | | updated icons | Phil Hughes | 2018-04-09 | 10 | -15/+54 |
| * | | | | | Merge branch 'master' into ide-staged-changes | Phil Hughes | 2018-04-09 | 139 | -149/+4388 |
| |\ \ \ \ \ | |||||
| * | | | | | | fixed failing tests because of passed `null` | Phil Hughes | 2018-04-07 | 4 | -3/+30 |
| * | | | | | | Merge branch 'master' into ide-staged-changes | Phil Hughes | 2018-04-07 | 489 | -13057/+35135 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | added ability to have `head` file to compare against | Phil Hughes | 2018-04-06 | 6 | -11/+19 |
| * | | | | | | | fixed eslint | Phil Hughes | 2018-04-06 | 1 | -1/+1 |
| * | | | | | | | updates to template text to be i18n ready | Phil Hughes | 2018-04-06 | 5 | -27/+35 |
| * | | | | | | | fixed delayed update viewer | Phil Hughes | 2018-04-05 | 4 | -6/+6 |
| * | | | | | | | fixed staged/unstaged files not opening when another 1 is open | Phil Hughes | 2018-04-05 | 3 | -9/+12 |
| * | | | | | | | fixed tab being clicked throwing an error | Phil Hughes | 2018-04-05 | 1 | -1/+1 |
| * | | | | | | | fixed changed icon showing after committing | Phil Hughes | 2018-04-05 | 1 | -0/+1 |
| * | | | | | | | fixed staged content not updating | Phil Hughes | 2018-04-05 | 5 | -8/+25 |
| * | | | | | | | fixed typo in selector | Phil Hughes | 2018-04-05 | 2 | -5/+3 |
| * | | | | | | | fixed karma & eslint | Phil Hughes | 2018-04-05 | 3 | -10/+12 |
| * | | | | | | | update staged files to correctly use pending tab | Phil Hughes | 2018-04-05 | 6 | -62/+42 |
| * | | | | | | | Merge branch 'master' into ide-staged-changes | Phil Hughes | 2018-04-05 | 294 | -1821/+4935 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into ide-staged-changes | Phil Hughes | 2018-04-03 | 240 | -2523/+6685 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | updated tests to use testAction helper | Phil Hughes | 2018-03-29 | 2 | -48/+55 |
| * | | | | | | | | | fixed alignment with icons | Phil Hughes | 2018-03-29 | 3 | -51/+54 |
| * | | | | | | | | | Merge branch 'master' into ide-staged-changes | Phil Hughes | 2018-03-29 | 298 | -2241/+4843 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ide-staged-changes | Phil Hughes | 2018-03-27 | 413 | -2531/+8749 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | double click to stage & unstage fileside-staged-changes | Phil Hughes | 2018-03-22 | 1 | -7/+11 |
| * | | | | | | | | | | | hide tooltip on collapse button when clicked | Phil Hughes | 2018-03-22 | 4 | -2/+15 |
| * | | | | | | | | | | | added tooltips to various icons in the sidebars | Phil Hughes | 2018-03-22 | 12 | -102/+246 |
| * | | | | | | | | | | | spec fixes | Phil Hughes | 2018-03-22 | 8 | -91/+52 |
| * | | | | | | | | | | | correctly stages and unstages files | Phil Hughes | 2018-03-22 | 14 | -64/+82 |
| * | | | | | | | | | | | Added staged files state to IDE | Phil Hughes | 2018-03-22 | 32 | -231/+1035 |
* | | | | | | | | | | | | Merge branch 'fix-direct-upload-for-old-records' into 'master' | Grzegorz Bizon | 2018-04-19 | 7 | -47/+176 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix direct_upload when records with null file_store are used | Kamil Trzciński | 2018-04-19 | 7 | -47/+176 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'fj-upgrade-gitlab-gollum-lib-to-4.2.7.2' into 'master' | Douwe Maan | 2018-04-19 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Upgrading gitlab-gollum-lib and rouge | Francisco Javier López | 2018-04-19 | 2 | -5/+5 |
* | | | | | | | | | | | | | Merge branch '41059-calculate-artifact-size-more-efficiently' into 'master' | Grzegorz Bizon | 2018-04-19 | 8 | -102/+172 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Update ProjectStatistics#build_artifacts_size synchronously without summing (... | Dylan Griffith | 2018-04-19 | 8 | -102/+172 |
* | | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-avoid-type-casting-in-uniqueness-validator' i... | Douwe Maan | 2018-04-19 | 2 | -22/+116 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | [Rails5] Avoid type casting in uniqueness validator | blackst0ne | 2018-04-19 | 2 | -22/+116 |
* | | | | | | | | | | | | | | Merge branch 'jprovazn-label-links' into 'master' | Sean McGivern | 2018-04-19 | 3 | -3/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fix label links update on project transfer | Jan Provaznik | 2018-04-19 | 3 | -3/+23 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch '44834-ide-remove-branch-from-bottom-bar' into 'master' | Phil Hughes | 2018-04-19 | 3 | -8/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |