summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add archived param to the json responsebvl-group-shared-projects-private-apiToon Claes2018-05-301-1/+1
|
* Fix small typosToon Claes2018-05-291-1/+1
|
* Add `shared_projects` endpointBob Van Landuyt2018-05-291-0/+31
| | | | | | | This endpoint lists projects shared with a group visible to the current user. The `filter` and `sort` params are supported like on the `children` endpoint.
* Merge branch 'dz-redesign-group-settings-page' into 'master'Filipa Lacerda2018-05-295-74/+156
|\ | | | | | | | | Redesign group settings page into expandable sections See merge request gitlab-org/gitlab-ce!19184
| * Use full path to group settings partialsDmitriy Zaporozhets2018-05-281-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Simplify titles for group settings sectionsDmitriy Zaporozhets2018-05-281-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Use render_if_exists for group settings page to keep same code as EEDmitriy Zaporozhets2018-05-282-0/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix tests after group settings page redesignDmitriy Zaporozhets2018-05-282-4/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Redesign group settings page into expandable sectionsDmitriy Zaporozhets2018-05-285-74/+152
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'groups-controller-show-performance' into 'master'Douwe Maan2018-05-291-18/+8
|\ \ | | | | | | | | | | | | Improve performance of GroupsController#show See merge request gitlab-org/gitlab-ce!18973
| * | Reduce queries in GroupProjectsFinderYorick Peterse2018-05-281-18/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | GroupProjectsFinder#collection_with_user would run the following code: if group.users.include?(current_user) When running this code for multiple groups this would result in one query being executed for every group. This commit simple removes the entire "if" statement with the code of the "else" statement. This ensures both paths use the same code, and removes the need for explicitly checking if a user is a member of the group.
* | Add helpful messages to empty wiki viewPaul Slaughter2018-05-296-8/+53
| |
* | Merge branch 'ab-45389-remove-double-checked-internal-id-generation' into ↵Yorick Peterse2018-05-281-20/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove double-checked internal id generation. Closes #45389 See merge request gitlab-org/gitlab-ce!19181
| * | Remove double-checked internal id generation.Andreas Brandl2018-05-281-20/+4
| | | | | | | | | | | | | | | | | | This was needed for a transition phase only. For details see #45389. Closes #45389.
* | | Merge branch 'ce-6225-unify-app-views-milestones' into 'master'Rémy Coutable2018-05-282-1/+5
|\ \ \ | | | | | | | | | | | | | | | | CE: Resolve "Extract EE specific files/lines for app/views/shared/milestones" See merge request gitlab-org/gitlab-ce!19185
| * | | Bring changes from EELin Jen-Shin2018-05-282-1/+5
| | | |
* | | | Resolve "Rename "secret variables" to "variables""Fabio Busatto2018-05-282-2/+2
| | | |
* | | | Merge branch 'patch-28' into 'master'Kamil Trzciński2018-05-281-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Returns a correct TMP_UPLOAD_PATH to workhourse Closes #46763 See merge request gitlab-org/gitlab-ce!19148
| * | | Update object_storage.rbShinya Maeda2018-05-281-1/+1
| |/ /
* | | Merge branch 'leipert-backport-bs4-merge-conflict' into 'master'Fatih Acet2018-05-281-6/+4
|\ \ \ | |_|/ |/| | | | | | | | Backport of CE->EE merge conflict resolution See merge request gitlab-org/gitlab-ce!19171
| * | backport EE version ofLukas Eipert2018-05-281-6/+4
| |/ | | | | | | | | | | | | `app/assets/javascripts/jobs/components/sidebar_details_block.vue` and run prettier Squashed commits: [4551a37adc] backport EE version of `app/assets/javascripts/jobs/components/sidebar_details_block.vue`
* | Merge branch 'sh-fix-admin-page-counts-take-2' into 'master'Yorick Peterse2018-05-283-12/+20
|\ \ | | | | | | | | | | | | | | | | | | Fix fast admin counters not working when PostgreSQL has secondaries Closes #46742 See merge request gitlab-org/gitlab-ce!19154
| * | Fix fast admin counters not working when PostgreSQL has secondariessh-fix-admin-page-counts-take-2Stan Hu2018-05-253-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit does a number of things: 1. Reduces the number of queries needed by perform a single query to get all the tuples for the relevant rows. 2. Uses a transaction to query the tuple counts to ensure that the data is retrieved from the primary. Closes #46742
* | | Merge branch '45190-create-notes-diff-files' into 'master'Douwe Maan2018-05-287-22/+82
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Persist and use truncated note diffs instead requesting Gitaly in a N+1 manner on MR page Closes #45190 See merge request gitlab-org/gitlab-ce!18991
| * | Persist truncated note diffs on a new table45190-create-notes-diff-filesOswaldo Ferreira2018-05-247-22/+82
| | | | | | | | | | | | | | | We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response. With this change we solve this problem and simplify a lot fetching this piece of info.
* | | Merge branch 'leipert-move-ee-specific-pipeline-scss-backport' into 'master'Annabel Gray2018-05-251-41/+61
|\ \ \ | |_|/ |/| | | | | | | | Backport changes of gitlab-ee!5852 See merge request gitlab-org/gitlab-ce!19145
| * | backport changes from ↵leipert-move-ee-specific-pipeline-scss-backportLukas Eipert2018-05-251-41/+61
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5852
* | | Merge branch 'winh-new-merge-request-encoding' into 'master'Mike Greiling2018-05-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix encoding of branch names on compare and new merge request page Closes #46627 See merge request gitlab-org/gitlab-ce!19143
| * | | Remove duplicate escaping from branch dropdownWinnie Hellmann2018-05-251-1/+1
| | | |
* | | | Merge branch 'bootstrap4' into 'master'Mike Greiling2018-05-25652-3055/+2865
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Upgrade to Bootstrap 4 Closes #45185 and #46710 See merge request gitlab-org/gitlab-ce!18232
| * | | Add text-secondary colors backClement Ho2018-05-251-0/+5
| | | |
| * | | Fix active sessions card layoutClement Ho2018-05-252-3/+4
| | | |
| * | | Fix login tabsAnnabel Dunstone Gray2018-05-246-22/+26
| | | |
| * | | Fix new issue page breakpointsAnnabel Dunstone Gray2018-05-243-10/+12
| | | |
| * | | Fix hide whitespace changes buttonClement Ho2018-05-241-1/+1
| | | |
| * | | Revert diff-files-changed sticky barClement Ho2018-05-241-1/+1
| | | |
| * | | Fix admin user projects tableAnnabel Dunstone Gray2018-05-242-3/+3
| | | |
| * | | Merge branch 'master' into bootstrap4Clement Ho2018-05-2423-62/+192
| |\ \ \ | | |/ /
| * | | Fix pipelines specClement Ho2018-05-241-0/+5
| | | |
| * | | Fix d-sm-block for wiki sidebarClement Ho2018-05-241-1/+1
| | | |
| * | | Replace data-test=page with .js-pagination-pageClement Ho2018-05-241-1/+1
| | | |
| * | | Re-add form-checkClement Ho2018-05-241-4/+5
| | | |
| * | | Fix new project viewAnnabel Dunstone Gray2018-05-242-1/+2
| | | |
| * | | Remove unnecessary milestone additionClement Ho2018-05-241-2/+0
| | | |
| * | | Remove tooltip bootstrap migration additionClement Ho2018-05-241-5/+0
| | | |
| * | | Revert diff notes bundle changeClement Ho2018-05-241-3/+2
| | | |
| * | | Fix group settings layoutAnnabel Dunstone Gray2018-05-242-7/+7
| | | |
| * | | Fix pipeline job tooltipClement Ho2018-05-241-0/+1
| | | |
| * | | Fix collapsed sidebar tooltipsClement Ho2018-05-2410-22/+28
| | | |
| * | | Fix external user badge colorAnnabel Dunstone Gray2018-05-241-0/+5
| | | |
View Lorry Controller Status