summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use gitaly 0.97.0gitaly-0.97.0Jacob Vosmaer2018-04-191-1/+1
* Merge branch 'ide-diff-marker-cache-fix' into 'master'Tim Zallmann2018-04-197-43/+123
|\
| * fixed spec with checking cached eventsPhil Hughes2018-04-111-1/+1
| * Fixed IDE diff markers being cached too longPhil Hughes2018-04-116-42/+122
* | Merge branch 'ide-staged-changes' into 'master'Tim Zallmann2018-04-1945-345/+1442
|\ \
| * \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-1978-474/+959
| |\ \
| * | | fixed prop name in specsPhil Hughes2018-04-182-2/+2
| * | | updates to variable names to make more sensePhil Hughes2018-04-188-38/+37
| * | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-18230-1440/+5845
| |\ \ \
| * \ \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-17577-5208/+7904
| |\ \ \ \
| * | | | | correctly dispose cached modelsPhil Hughes2018-04-112-1/+36
| * | | | | fixed karma specs with change in icon namePhil Hughes2018-04-092-2/+2
| * | | | | updated iconsPhil Hughes2018-04-0910-15/+54
| * | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-09139-149/+4388
| |\ \ \ \ \
| * | | | | | fixed failing tests because of passed `null`Phil Hughes2018-04-074-3/+30
| * | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-07489-13057/+35135
| |\ \ \ \ \ \
| * | | | | | | added ability to have `head` file to compare againstPhil Hughes2018-04-066-11/+19
| * | | | | | | fixed eslintPhil Hughes2018-04-061-1/+1
| * | | | | | | updates to template text to be i18n readyPhil Hughes2018-04-065-27/+35
| * | | | | | | fixed delayed update viewerPhil Hughes2018-04-054-6/+6
| * | | | | | | fixed staged/unstaged files not opening when another 1 is openPhil Hughes2018-04-053-9/+12
| * | | | | | | fixed tab being clicked throwing an errorPhil Hughes2018-04-051-1/+1
| * | | | | | | fixed changed icon showing after committingPhil Hughes2018-04-051-0/+1
| * | | | | | | fixed staged content not updatingPhil Hughes2018-04-055-8/+25
| * | | | | | | fixed typo in selectorPhil Hughes2018-04-052-5/+3
| * | | | | | | fixed karma & eslintPhil Hughes2018-04-053-10/+12
| * | | | | | | update staged files to correctly use pending tabPhil Hughes2018-04-056-62/+42
| * | | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-05294-1821/+4935
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-03240-2523/+6685
| |\ \ \ \ \ \ \ \
| * | | | | | | | | updated tests to use testAction helperPhil Hughes2018-03-292-48/+55
| * | | | | | | | | fixed alignment with iconsPhil Hughes2018-03-293-51/+54
| * | | | | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-03-29298-2241/+4843
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-03-27413-2531/+8749
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | double click to stage & unstage fileside-staged-changesPhil Hughes2018-03-221-7/+11
| * | | | | | | | | | | hide tooltip on collapse button when clickedPhil Hughes2018-03-224-2/+15
| * | | | | | | | | | | added tooltips to various icons in the sidebarsPhil Hughes2018-03-2212-102/+246
| * | | | | | | | | | | spec fixesPhil Hughes2018-03-228-91/+52
| * | | | | | | | | | | correctly stages and unstages filesPhil Hughes2018-03-2214-64/+82
| * | | | | | | | | | | Added staged files state to IDEPhil Hughes2018-03-2232-231/+1035
* | | | | | | | | | | | Merge branch 'fix-direct-upload-for-old-records' into 'master'Grzegorz Bizon2018-04-197-47/+176
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix direct_upload when records with null file_store are usedKamil Trzciński2018-04-197-47/+176
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fj-upgrade-gitlab-gollum-lib-to-4.2.7.2' into 'master'Douwe Maan2018-04-192-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Upgrading gitlab-gollum-lib and rougeFrancisco Javier López2018-04-192-5/+5
* | | | | | | | | | | | | Merge branch '41059-calculate-artifact-size-more-efficiently' into 'master'Grzegorz Bizon2018-04-198-102/+172
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update ProjectStatistics#build_artifacts_size synchronously without summing (...Dylan Griffith2018-04-198-102/+172
* | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-avoid-type-casting-in-uniqueness-validator' i...Douwe Maan2018-04-192-22/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | [Rails5] Avoid type casting in uniqueness validatorblackst0ne2018-04-192-22/+116
* | | | | | | | | | | | | | Merge branch 'jprovazn-label-links' into 'master'Sean McGivern2018-04-193-3/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix label links update on project transferJan Provaznik2018-04-193-3/+23
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '44834-ide-remove-branch-from-bottom-bar' into 'master'Phil Hughes2018-04-193-8/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |