summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-add-2fa-filter-admin-api' into 'master'Douwe Maan2018-04-231-0/+12
|\
| * Add 2FA filter to users API for admins onlyDmitriy Zaporozhets2018-04-231-0/+12
* | Flowdock uses Gitaly, not GritZeger-Jan van de Weg2018-04-231-1/+47
|/
* Removes 'no job log' from trace actionMayra Cabrera2018-04-221-2/+0
* Atomic internal ids for all modelsAndreas Brandl2018-04-206-28/+15
* Merge branch '42803-show-new-branch-mr-button' into 'master'Sean McGivern2018-04-204-27/+50
|\
| * Moves Uniquify counter in the initializerJacopo2018-04-192-12/+17
| * Uses Uniquify to calculate Issue#suggested_branch_nameJacopo2018-04-192-6/+9
| * Shows new branch/mr button even when branch existsJacopo2018-04-193-20/+35
* | Resolve "Text from the diff is showing within a table header inside the discu...Simon Knox2018-04-201-1/+1
* | Merge branch 'issue_45435' into 'master'Phil Hughes2018-04-201-0/+2
|\ \
| * | Fix issues without links when added from boards new issue modalFelipe Artur2018-04-191-0/+2
* | | Refactored activity calendarJose2018-04-191-75/+130
* | | Respect visibility options and description when importing project from templateFrancisco Javier López2018-04-191-1/+2
* | | Resolve "Improve tooltips of collapsed sidebars"Dennis Tang2018-04-1927-100/+374
* | | Merge branch '45507-fix-repository-archive-url' into 'master'Douwe Maan2018-04-191-5/+6
|\ \ \
| * | | Fix specifying a non-default ref when requesting an archive using the legacy URLNick Thomas2018-04-191-5/+6
* | | | Merge branch 'sh-fix-award-emoji-nplus-one-participants' into 'master'Yorick Peterse2018-04-191-1/+1
|\ \ \ \
| * | | | Fix N+1 queries when loading participants for a commit noteStan Hu2018-04-181-1/+1
* | | | | Merge branch 'blackst0ne-rails5-update-user-manageable-groups' into 'master'Yorick Peterse2018-04-191-4/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | [Rails5] Fix `User#manageable_groups`blackst0ne2018-04-191-4/+7
* | | | | 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