| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Use new renamed markup methoddm-blob-viewers | Douwe Maan | 2017-04-27 | 1 | -0/+2 |
| | | |||||
| * | Address feedback | Douwe Maan | 2017-04-27 | 3 | -28/+34 |
| | | |||||
| * | Added specs for JS method to switch views | Phil Hughes | 2017-04-27 | 1 | -2/+39 |
| | | |||||
| * | Fixed failing JS tests | Phil Hughes | 2017-04-27 | 1 | -3/+7 |
| | | |||||
| * | Satisfy Rubocop | Douwe Maan | 2017-04-27 | 2 | -2/+0 |
| | | |||||
| * | Add specs | Douwe Maan | 2017-04-27 | 9 | -45/+898 |
| | | |||||
| * | Render viewer error synchronously so that 'view the source' link will work | Douwe Maan | 2017-04-27 | 5 | -12/+7 |
| | | |||||
| * | Add test stubs | Douwe Maan | 2017-04-27 | 7 | -191/+31 |
| | | |||||
| * | Fix some specs | Douwe Maan | 2017-04-27 | 2 | -5/+5 |
| | | |||||
| * | Add specs | Douwe Maan | 2017-04-27 | 3 | -13/+191 |
| | | |||||
| * | Merge branch 'remove-invalid-services' into 'master' | Douwe Maan | 2017-04-27 | 5 | -24/+38 |
| |\ | | | | | | | | | Remove invalid services with nil or empty type See merge request !10847 | ||||
| | * | tadds migration to remove invalid services | Tiago Botelho | 2017-04-27 | 5 | -25/+35 |
| | | | |||||
| | * | remove invalid services | Tiago Botelho | 2017-04-26 | 1 | -0/+4 |
| | | | |||||
| * | | Merge branch ↵ | Sean McGivern | 2017-04-27 | 1 | -0/+24 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized' into 'master' Resolve "Milestone sidebar display incorect number of MR when minimized" Closes #31292 See merge request !10933 | ||||
| | * | | Added test31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized | Luke "Jared" Bennett | 2017-04-26 | 1 | -0/+24 |
| | | | | |||||
| * | | | Merge branch '30973-fix-network-graph-ordering' into 'master' | Douwe Maan | 2017-04-27 | 2 | -0/+50 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix ordering of commits in the network graph. Closes #30973 See merge request !10936 | ||||
| | * | | | Fix ordering of commits in the network graph. | Timothy Andrew | 2017-04-27 | 2 | -0/+50 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1 - Prior to this upgrade, the default sort order for commits returned by `Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the graph relied on. - While upgrading `rugged`, the MR also changed this default to `Rugged::SORT_NONE`, which broke commit ordering in the graph. - This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort by date, and changes the graph builder `Network::Graph` so it explictly requests the `:date` sort order | ||||
| * | | | Merge branch '2246-uuid-is-nil-for-new-installation' into 'master' | Sean McGivern | 2017-04-27 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Lazily set UUID in ApplicationSetting for new installations Closes gitlab-ee#2246 See merge request !10893 | ||||
| | * | | | Lazily sets UUID in ApplicationSetting for new installations | Douglas Barbosa Alexandre | 2017-04-26 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'dz-add-cohort-spec' into 'master' | Sean McGivern | 2017-04-27 | 1 | -0/+15 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Increase code coverage for admin/cohorts page See merge request !10964 | ||||
| | * | | | | Increase code coverage for admin/cohorts pagedz-add-cohort-spec | Dmitriy Zaporozhets | 2017-04-27 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | Remove unused code | Filipa Lacerda | 2017-04-27 | 1 | -0/+64 |
| | | | | | | |||||
| * | | | | | Use vue files for vue components. | Filipa Lacerda | 2017-04-27 | 2 | -2/+7 |
| | | | | | | |||||
| * | | | | | Merge branch 'tc-make-user-master-project-by-admin' into 'master' | Rémy Coutable | 2017-04-27 | 1 | -0/+16 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make namespace owner master of project upon creation Closes #29446 See merge request !10910 | ||||
| | * | | | | | Make namespace owner master of project upon creationtc-make-user-master-project-by-admin | Toon Claes | 2017-04-27 | 1 | -0/+16 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | When an admin creates a project in the namespace of a user, that user automatically gains master access to that project. | ||||
| * | | | | | Merge branch '26585-remove-readme-view-caching' into 'master' | Douwe Maan | 2017-04-27 | 8 | -57/+34 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove view fragment caching for project READMEs Closes #26585 and #29594 See merge request !8838 | ||||
| | * | | | | | Remove the unnecessary ApplicationSetting stubbing | Toon Claes | 2017-04-27 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | Remove unused optional parameter `asciidoc_opts` | Toon Claes | 2017-04-27 | 1 | -19/+2 |
| | | | | | | | |||||
| | * | | | | | Fix failing specs | Toon Claes | 2017-04-27 | 2 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Refactor MarkupHelper | Douwe Maan | 2017-04-27 | 1 | -10/+10 |
| | | | | | | | |||||
| | * | | | | | Cache the rendered README, but post-process on show | Toon Claes | 2017-04-27 | 3 | -31/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the post-processing of the rendered README is dependent on the context (i.e. the current user), do the post-processing when the README is being displayed. | ||||
| | * | | | | | Move some methods from ApplicationHelper to MarkupHelper | Toon Claes | 2017-04-27 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | Rename GitlabMarkdownHelper -> MarkupHelper | Toon Claes | 2017-04-27 | 4 | -4/+4 |
| | |/ / / / | | | | | | | | | | | | | | | | It does more than solely GitLab Markdown, so rename to MarkupHelper. | ||||
| * | | | | | Merge branch '29505-allow-admins-sudo-to-blocked-users' into 'master' | Rémy Coutable | 2017-04-27 | 1 | -1/+27 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Allow admins to sudo to blocked users See merge request !10842 | ||||
| | * | | | | Allow admins to sudo to blocked users.29505-allow-admins-sudo-to-blocked-users | Timothy Andrew | 2017-04-26 | 1 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Currently, (for example) admins can't delete snippets for blocked users, which is an unexpected limitation. - We modify `authenticate!` to conduct the `access_api` policy check against the `initial_current_user`, instead of the user being impersonated. - Update CHANGELOG for !10842 | ||||
| * | | | | | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser' | Sean McGivern | 2017-04-27 | 4 | -5/+38 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix rendering emoji inside a string | blackst0ne | 2017-04-25 | 4 | -5/+38 |
| | | | | | | | |||||
| * | | | | | | Add button to delete filters from filtered search bar | Clement Ho | 2017-04-26 | 4 | -7/+81 |
| | |_|/ / / |/| | | | | |||||
| * | | | | | Merge branch 'gl-version-backup-file' into 'master' | Rémy Coutable | 2017-04-26 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab version to backup file name See merge request !10901 | ||||
| | * | | | | | Fix failing specgl-version-backup-file | Achilleas Pipinellis | 2017-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | http://rubular.com/r/op7TI9UX6K | ||||
| * | | | | | | Resolve "Jobs dropdown in mini graph should close when we receive an error" | Filipa Lacerda | 2017-04-26 | 2 | -46/+75 |
| | | | | | | | |||||
| * | | | | | | Submodule Dockerfile templates | Zeger-Jan van de Weg | 2017-04-26 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | Use rspec-set to speed up examples | Zeger-Jan van de Weg | 2017-04-26 | 3 | -34/+40 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'backport-md-cache-fix' into 'master' | Dmitriy Zaporozhets | 2017-04-26 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work around a hard-to-understand failure in `CacheMarkdownField` See merge request !10918 | ||||
| | * | | | | | | Fix a failing spec | Nick Thomas | 2017-04-25 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '26509-show-update-time' into 'master' | Annabel Dunstone Gray | 2017-04-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add updated time to project list Closes #26509 See merge request !8514 | ||||
| | * | | | | | | | Add updated time to project list | Jeff Stubler | 2017-04-21 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch ↵ | Clement Ho | 2017-04-26 | 1 | -0/+30 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22826-ui-inconsistency-different-files-views-find-file-button-missing' into 'master' [#22826] Ensure find_file_link and download button is part of file tree header Closes #22826 See merge request !9847 | ||||
| | * | | | | | | | | [#22826] Add newline before expect in accordance to four phase thoughtbot style | TM Lee | 2017-04-25 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | [#22826] Ensure find_file_link and download button is part of file tree header | TM Lee | 2017-04-23 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the find_file_link and download partial into the project tree_header partial - Added Changelog | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |