summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Shows new branch/mr button even when branch existsJacopo2018-04-193-20/+35
* Merge branch 'ide-diff-marker-cache-fix' into 'master'Tim Zallmann2018-04-193-13/+37
|\
| * Fixed IDE diff markers being cached too longPhil Hughes2018-04-113-13/+37
* | Merge branch 'ide-staged-changes' into 'master'Tim Zallmann2018-04-1926-271/+837
|\ \
| * \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-1939-237/+402
| |\ \
| * | | updates to variable names to make more sensePhil Hughes2018-04-186-36/+35
| * | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-1888-385/+764
| |\ \ \
| * \ \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-17176-1440/+1755
| |\ \ \ \
| * | | | | correctly dispose cached modelsPhil Hughes2018-04-111-1/+10
| * | | | | updated iconsPhil Hughes2018-04-0910-15/+54
| * | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-0972-119/+1454
| |\ \ \ \ \
| * | | | | | fixed failing tests because of passed `null`Phil Hughes2018-04-071-1/+1
| * | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-07170-1196/+2636
| |\ \ \ \ \ \
| * | | | | | | 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-051-3/+1
| * | | | | | | update staged files to correctly use pending tabPhil Hughes2018-04-055-42/+33
| * | | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-05107-614/+1039
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-0376-782/+2168
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fixed alignment with iconsPhil Hughes2018-03-293-51/+54
| * | | | | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-03-29106-1248/+1683
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-03-27130-759/+1897
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | double click to stage & unstage fileside-staged-changesPhil Hughes2018-03-221-7/+11
| * | | | | | | | | | | hide tooltip on collapse button when clickedPhil Hughes2018-03-223-2/+14
| * | | | | | | | | | | added tooltips to various icons in the sidebarsPhil Hughes2018-03-2212-102/+246
| * | | | | | | | | | | spec fixesPhil Hughes2018-03-221-1/+4
| * | | | | | | | | | | correctly stages and unstages filesPhil Hughes2018-03-2214-64/+82
| * | | | | | | | | | | Added staged files state to IDEPhil Hughes2018-03-2218-195/+486
* | | | | | | | | | | | Fix direct_upload when records with null file_store are usedKamil Trzciński2018-04-193-16/+23
* | | | | | | | | | | | Merge branch '41059-calculate-artifact-size-more-efficiently' into 'master'Grzegorz Bizon2018-04-194-27/+54
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update ProjectStatistics#build_artifacts_size synchronously without summing (...Dylan Griffith2018-04-194-27/+54
* | | | | | | | | | | | | Fix label links update on project transferJan Provaznik2018-04-191-3/+8
* | | | | | | | | | | | | Resolve "Get rid of branch element all in bottom bar in WEB IDE"André Luís2018-04-192-8/+5
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | Resolve "Show `failure_reason` in jobs view content section"Mayra Cabrera2018-04-199-163/+295
* | | | | | | | | | | | Merge branch '5320-fix-gitlab-features-env-var' into 'master'Grzegorz Bizon2018-04-193-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Get GITLAB_FEATURES from Project#licensed_features instead of Namespace#featu...5320-fix-gitlab-features-env-varDylan Griffith2018-04-093-5/+5
* | | | | | | | | | | | | Resolve "View labels when editing labels in sidebar and board sidebar"André Luís2018-04-184-6/+11
* | | | | | | | | | | | | Merge branch 'revert-goldiloader' into 'master'Robert Speicher2018-04-1816-42/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert the addition of goldiloaderYorick Peterse2018-04-1816-42/+42
* | | | | | | | | | | | | | Merge branch 'bvl-shared-groups-on-group-page' into 'master'Rémy Coutable2018-04-182-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "Don't include projects shared as group-descendants"Bob Van Landuyt2018-04-181-4/+2
| * | | | | | | | | | | | | | Recover from errors when a parent is not preloadedBob Van Landuyt2018-04-181-1/+14
* | | | | | | | | | | | | | | Fix Custom hooks are not triggered by UI wiki editFrancisco Javier López2018-04-184-14/+31
|/ / / / / / / / / / / / / /