summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-222-21/+9
* 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
* | | | Merge branch '36958-enable-ordering-projects-subgroups-by-name' into 'master'Rémy Coutable2017-12-213-21/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | Enable sorting by name in the Groups dropdownMark Fletcher2017-12-201-0/+2
| * | | Employ Groups dropdown in admin viewMark Fletcher2017-12-202-19/+7
| * | | Accept options hash for Groups dropdownMark Fletcher2017-12-201-2/+3
| |/ /
* | | Merge branch 'jivl-replace-d3-v3-v4' into 'master'Mike Greiling2017-12-207-64/+105
|\ \ \
| * | | added minChunks to the common_d3 bundlejivl-replace-d3-v3-v4Jose Ivan Vargas2017-12-182-7/+1
| * | | Removed fills from stat_contributors_graphJose Ivan Vargas2017-12-181-3/+0
| * | | cleaned up date_time_formattersJose Ivan Vargas2017-12-181-17/+8
| * | | Restored the timeScaleFormat for the prometheus dashboardJose Ivan Vargas2017-12-182-6/+41
| * | | Refactored d3 modules to instead of having a common_d3 dir, to use the micro ...Jose Ivan Vargas2017-12-187-121/+73
| * | | corrected functionality from the stat_contributors_graphJose Ivan Vargas2017-12-183-10/+25
| * | | fixed specs and the non-rendering stat_graph_contributors_graphJose Ivan Vargas2017-12-182-7/+6
| * | | optimized d3 v4 with a custom made bundleJose Ivan Vargas2017-12-186-6/+46
| * | | Modified contributors graph to use d3 v4Jose Ivan Vargas2017-12-182-24/+38
| * | | Update d3 to v4 and migrated the prometheus dashboardJose Ivan Vargas2017-12-183-43/+47
| | |/ | |/|
* | | Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7Kim Carlbäcker2017-12-202-7/+11
* | | Merge branch 'layout-nav-es-module' into 'master'Filipa Lacerda2017-12-202-42/+33
|\ \ \
| * \ \ Merge branch 'master' into layout-nav-es-modulelayout-nav-es-moduleFilipa Lacerda2017-12-2029-128/+183
| |\ \ \
| * | | | Changed layout_nav to ES modulePhil Hughes2017-12-192-42/+33
* | | | | Merge branch '39246-fork-and-import-jobs-should-only-be-marked-as-failed-when...Douwe Maan2017-12-204-36/+29
|\ \ \ \ \
| * | | | | Fork and Import jobs only get marked as failed when the number of Sidekiq ret...39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhaustedTiago Botelho2017-12-154-36/+29
* | | | | | Merge branch 'rs-blocks-json-serialization' into 'master'Douwe Maan2017-12-209-10/+26
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-192-3/+3
| * | | | | Add a JsonSerializationError class instead of raising SecurityErrorRobert Speicher2017-12-191-2/+4
| * | | | | Use UserSerializer instead of `User.to_json`Robert Speicher2017-12-195-7/+6
| * | | | | Accept arguments to blocked JSON serialization methodsRobert Speicher2017-12-191-1/+1