summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch '36782-replace-team-user-role-with-add_role-user-in-specs' into ...Rémy Coutable2017-12-232-21/+9
|\ \ \
| * | | Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-222-21/+9
* | | | Merge branch 'dm-diff-note-for-line-performance' into 'master'Robert Speicher2017-12-224-20/+6
|\ \ \ \
| * | | | Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_...Douwe Maan2017-12-224-20/+6
* | | | | Merge branch 'fj-revert-event-target-author-preloading' into 'master'Stan Hu2017-12-221-1/+1
|\ \ \ \ \
| * | | | | Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788Francisco Javier López2017-12-221-1/+1
* | | | | | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-2212-40/+97
* | | | | | Merge branch 'dm-issue-move-transaction-error' into 'master'Robert Speicher2017-12-221-5/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Execute project hooks and services after commit when moving an issuedm-issue-move-transaction-errorDouwe Maan2017-12-221-5/+11
| |/ / / /
* | | | | Use relative URLs when linking to uploaded filesNick Thomas2017-12-221-1/+1
* | | | | Merge branch 'dz-fix-seed-fu' into 'master'Douwe Maan2017-12-221-0/+1
|\ \ \ \ \
| * | | | | Explictly require Gitlab::Utils in ProjectFeaturesCompatibilitydz-fix-seed-fuDmitriy Zaporozhets2017-12-221-0/+1
* | | | | | Merge branch 'jivl-general-icons-2' into 'master'Tim Zallmann2017-12-2225-34/+74
|\ \ \ \ \ \
| * | | | | | Replaced the remaining code-fork iconsjivl-general-icons-2Jose Ivan Vargas2017-12-1916-19/+39
| * | | | | | code-fork replacementsJose Ivan Vargas2017-12-192-6/+7
| * | | | | | Replaced some fork icons instances and fixed the Icon component on the MR WidgetJose Ivan Vargas2017-12-198-12/+25
| * | | | | | replaced download icon for the sprite based oneJose Ivan Vargas2017-12-197-11/+17
* | | | | | | Merge branch 'fl-update-svg' into 'master'Tim Zallmann2017-12-227-3/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Update DependenciesFilipa Lacerda2017-12-217-3/+7
| | |/ / / / | |/| | | |
* | | | | | Last push event widget width for fixed layoutGeorge Tsiolis2017-12-212-14/+16
* | | | | | Merge branch '33609-hide-pagination' into 'master'Clement Ho2017-12-211-1/+7
|\ \ \ \ \ \
| * | | | | | Do not show Vue pagination if only one pageMario de la Ossa2017-12-211-1/+7
* | | | | | | Merge branch 'jprovazn-search' into 'master'Yorick Peterse2017-12-212-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Skip projects filter on merge requests searchjprovazn-searchJan Provaznik2017-12-212-1/+5
* | | | | | | | Merge branch 'fix-webpack-chunk-naming' into 'master'Jacob Schatz2017-12-212-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into fix-webpack-chunk-namingClement Ho2017-12-21159-1453/+2668
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | update dispatcher to allow for dynamic imports until webpack plugin is updatedfix-webpack-chunk-namingMike Greiling2017-12-202-1/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'bvl-patch-mr-serializer' into 'master'Douwe Maan2017-12-211-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fall back to the `MergeRequestWidgetEntity`Bob Van Landuyt2017-12-211-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Resolve "Decouple multi-file editor from file list"Tim Zallmann2017-12-2186-1098/+2158
| |_|/ / / |/| | | |
* | | | | LDAP extern_uids are not normalized when updated via APIFrancisco Javier López2017-12-211-0/+10
|/ / / /
* | | | Restore missing language code in datetime_utility.jsWinnie Hellmann2017-12-211-5/+13
* | | | Merge branch '40063-markdown-editor-improvements' into 'master'Filipa Lacerda2017-12-214-17/+26
|\ \ \ \
| * | | | Add spec for previewing a note40063-markdown-editor-improvementsAnnabel Dunstone Gray2017-12-202-2/+2
| * | | | Hide & show toolbar on MR pageAnnabel Dunstone Gray2017-12-182-4/+4
| * | | | Fix formattingAnnabel Dunstone Gray2017-12-182-12/+12
| * | | | Hide toolbar in markdown preview modeAnnabel Dunstone Gray2017-12-183-11/+20
| |/ / /
* | | | Merge branch 'rs-remove-useless-definition' into 'master'Douwe Maan2017-12-211-5/+0
|\ \ \ \
| * | | | Remove a redundant `InvalidPathError` definitionrs-remove-useless-definitionRobert Speicher2017-12-201-5/+0
* | | | | Merge branch '38356-add-last_commit_sha-to-the-commit-api' into 'master'Douwe Maan2017-12-214-20/+38
|\ \ \ \ \
| * | | | | Updates from last code review:38356-add-last_commit_sha-to-the-commit-apiRubén Dávila2017-12-204-27/+33
| * | | | | Check if file has been modified for each action provided.Rubén Dávila2017-12-201-0/+12
| | |_|/ / | |/| | |