summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix import project url not updating project namejivl-fix-import-project-url-bugJose Ivan Vargas2018-01-031-3/+4
* Merge branch 'tz-ide-file-icons' into 'master'Sean McGivern2018-01-037-16/+720
|\
| * Multi File Editor File iconsTim Zallmann2018-01-037-16/+720
* | Merge branch '41120-performance-bar-auto-scroll' into 'master'Tim Zallmann2018-01-031-10/+15
|\ \ | |/ |/|
| * Cache document query41120-performance-bar-auto-scrollFilipa Lacerda2018-01-021-2/+3
| * Merge branch 'master' into 41120-performance-bar-auto-scrollFilipa Lacerda2018-01-02175-1541/+2720
| |\
| * | Use non cached variables to get scroll position because of the performance barFilipa Lacerda2017-12-211-10/+14
* | | Merge branch 'gitaly-conflict-resolver' into 'master'Grzegorz Bizon2018-01-031-1/+1
|\ \ \
| * | | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-271-1/+1
* | | | Merge branch '41357-empty-state-mr' into 'master'Annabel Dunstone Gray2018-01-032-9/+11
|\ \ \ \
| * | | | Resolve "Modify the empty state of changes in MR"Filipa Lacerda2018-01-032-9/+11
| | |_|/ | |/| |
* | | | Merge branch 'fix/remove-unnecessary-sidebar-element-alignment' into 'master'Annabel Dunstone Gray2018-01-031-4/+0
|\ \ \ \
| * | | | Remove unnecessary sidebar element realignmentGeorge Tsiolis2018-01-021-4/+0
| |/ / /
* | | | Merge branch 'jramsay-41287-well-list-overflow' into 'master'Annabel Dunstone Gray2018-01-031-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add break word wrapping to well-listjramsay-41287-well-list-overflowJames Ramsay2018-01-021-0/+1
* | | | Merge branch 'fix/activity-inline-event-line-height' into 'master'Annabel Dunstone Gray2018-01-021-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Fix activity inline event line height on mobileGeorge Tsiolis2017-12-281-1/+6
| |/ /
* | | Merge branch 'rd-fix-reset-password-while-logged-in' into 'master'Robert Speicher2018-01-021-0/+2
|\ \ \
| * | | Allow logged in user to change his passwordrd-fix-reset-password-while-logged-inRubén Dávila2017-12-311-0/+2
* | | | Merge branch 'fj-40053-error-500-members-list' into 'master'Douwe Maan2018-01-022-3/+8
|\ \ \ \
| * | | | Fix user membership destroy relationFrancisco Javier López2018-01-022-3/+8
* | | | | Merge branch 'qa-add-deploy-key' into 'master'Grzegorz Bizon2018-01-021-1/+1
|\ \ \ \ \
| * | | | | Just add a new class to locate the expand buttonLin Jen-Shin2017-12-281-1/+1
* | | | | | Merge branch 'bvl-fork-public-project-to-private-namespace' into 'master'Douwe Maan2018-01-021-7/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Forking a project to a namespace with lower visibility.bvl-fork-public-project-to-private-namespaceBob Van Landuyt2017-12-291-7/+7
* | | | | | Clears visual token on second backspaceMartin Wortschack2018-01-021-15/+27
* | | | | | Merge branch '40780-choose-file' into 'master'Tim Zallmann2018-01-024-30/+23
|\ \ \ \ \ \
| * | | | | | Uniform style between all upload forms40780-choose-fileFilipa Lacerda2017-12-224-30/+23
| * | | | | | Update Browse file to Choose file in all occurencesFilipa Lacerda2017-12-212-2/+2
* | | | | | | Merge branch '40274-user-settings-breadcrumbs' into 'master'Sean McGivern2018-01-022-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Add breadcrumbs to User Settings sub-viewsRob Watson2018-01-012-0/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Fix 404 error after a user edits an issue description and solves the reCAPTCHAsh-fix-spam-update-404Stan Hu2017-12-301-1/+2
|/ / / / / /
* | | | | | Merge branch 'fix/profile-settings-content-width' into 'master'Robert Speicher2017-12-291-0/+1
|\ \ \ \ \ \
| * | | | | | Adjust content width for User Settings, GPG KeysGeorge Tsiolis2017-12-281-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix/profile-settings-sidebar-heading' into 'master'Robert Speicher2017-12-292-4/+4
|\ \ \ \ \ \
| * | | | | | Keep typographic hierarchy in User SettingsGeorge Tsiolis2017-12-292-4/+4
| |/ / / / /
* | | | | | Merge branch '41492-mr-comment-fix' into 'master'Sean McGivern2017-12-291-2/+7
|\ \ \ \ \ \
| * | | | | | Fix links to old commits in merge requests41492-mr-comment-fixJarka Kadlecová2017-12-291-2/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '20035-pause-resume-runners' into 'master'Grzegorz Bizon2017-12-292-4/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add pause/resume button to specific project runnersMario de la Ossa2017-12-272-4/+8
* | | | | | Fixed abuse reports link urlmegos2017-12-281-1/+1
* | | | | | Resolve "Webpack Roadmap"Constance Okoghenun2017-12-286-221/+212
* | | | | | Merge branch 'show_proper_labels_in_board_issue_sidebar_when_issue_is_closed'...Sean McGivern2017-12-281-1/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | remove the labelChristiaan Van den Poel2017-12-171-1/+0
* | | | | | Merge branch '24347-dont-post-system-note-when-branch-creation-fails' into 'm...Stan Hu2017-12-271-3/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Refactor success status in branch controllerMateusz Bajorski2017-12-271-3/+5
| * | | | | Fix when branch creation fails don't post system noteMateusz Bajorski2017-12-261-1/+1
| | |/ / / | |/| | |
* | | | | Humanize the units of "Showing last X KiB of log" in job tracesh-make-kib-humanStan Hu2017-12-272-3/+3
|/ / / /
* | | | Merge branch 'gitaly-remotes' into 'master'Dmitriy Zaporozhets2017-12-251-4/+0
|\ \ \ \
| * | | | Remove unused method `remote_exists?`Alejandro Rodríguez2017-12-221-4/+0