summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [skip ci] use vuex to manage state instead of internal propscomment-image-diffClement Ho2017-09-198-45/+43
|
* Merge branch 'vueify-image-diff' into comment-image-diffClement Ho2017-09-1911-46/+61
|\
| * Add deleted image specvueify-image-diffClement Ho2017-09-191-15/+27
| |
| * add changelogClement Ho2017-09-191-0/+5
| |
| * Use keyword argumentClement Ho2017-09-192-2/+2
| |
| * Use btn-transparentClement Ho2017-09-192-10/+7
| |
| * Add namespace for internationalizationClement Ho2017-09-191-3/+3
| |
| * className => class-nameClement Ho2017-09-194-7/+7
| |
| * Explicitly declare constantViewTypesClement Ho2017-09-191-6/+9
| |
| * Remove duplicate css propertyClement Ho2017-09-191-2/+0
| |
| * Fix spec nameClement Ho2017-09-191-1/+1
| |
* | Merge branch 'vueify-image-diff' into comment-image-diffClement Ho2017-09-1813-48/+64
|\ \ | |/
| * Add test for view file linksClement Ho2017-09-182-1/+19
| |
| * Fix spinach test with new view file button linkClement Ho2017-09-181-1/+1
| |
| * DRY up constants and rename to viewTypesClement Ho2017-09-183-29/+21
| |
| * Change v-if order for easier readabilityClement Ho2017-09-181-5/+5
| |
| * Use gl.TEST_HOST instead of host.invalid for consistencyClement Ho2017-09-181-3/+3
| |
| * Add i8nClement Ho2017-09-182-4/+8
| |
| * Explicitly transform this.images.added into a booleanClement Ho2017-09-181-1/+1
| |
| * Fix redundant import pathsClement Ho2017-09-185-6/+6
| |
| * Add comment for swipeBar left:1Clement Ho2017-09-181-0/+2
| |
* | [skip ci] use one vuex storeClement Ho2017-09-188-42/+98
| |
* | Merge branch 'vueify-image-diff' into comment-image-diffClement Ho2017-09-18124-1102/+2283
|\ \ | |/
| * Merge commit '9b13753302df7a3e8ef86c6af3f84066bde31a21' into vueify-image-diffClement Ho2017-09-18112-1075/+1925
| |\
| | * Merge branch 'sh-optimize-discussion-json' into 'master'Yorick Peterse2017-09-184-3/+40
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Eliminate N+1 queries in loading discussions.json endpoint Closes #37955 See merge request gitlab-org/gitlab-ce!14327
| | | * Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-jsonStan Hu2017-09-184-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #37955,we see that the profile had a number of N+1 queries from repeated access to `cross_reference_not_visible_for?`. This was optimized in previous versions of GitLab by rendering all notes at once, counting the number of visible references, and then using that number to check whether a system note should be fully redacted. There was also another N+1 query calling `ProjectTeam#member?`, which did not take advantage of an optimization in prepare_notes_for_rendering that would preload the maximum access level per project. Closes #37955
| | * | Merge branch '37590-pipelines-mr' into 'master'Annabel Dunstone Gray2017-09-182-0/+10
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mini graph pipeline breaking in merge request view Closes #37590 See merge request gitlab-org/gitlab-ce!14306
| | | * | Fix mini graph pipeline breakin in merge request view37590-pipelines-mrFilipa Lacerda2017-09-152-0/+10
| | | | |
| | * | | Merge branch 'winh-missing-javascript-imports' into 'master'Tim Zallmann2017-09-183-0/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add missing import statements See merge request gitlab-org/gitlab-ce!14209
| | | * | | Add missing import statementswinh-missing-javascript-importswinh2017-09-183-0/+5
| | | | | |
| | * | | | Merge branch 'milestone-avatar-issuable-link' into 'master'Tim Zallmann2017-09-183-1/+25
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes milestone issuable assignee URL Closes #33124 See merge request gitlab-org/gitlab-ce!14292
| | | * | | | Fixes milestone issuable assignee URLmilestone-avatar-issuable-linkPhil Hughes2017-09-153-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33124
| | * | | | | Merge branch ↵Phil Hughes2017-09-181-1/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37933-improve-new-project-page-description-explaining-what-a-project-is' into 'master' Resolve "Improve “New project“ page description explaining what a project is" Closes #37933 See merge request gitlab-org/gitlab-ce!14331
| | | * | | | | Improve “New project“ page description37933-improve-new-project-page-description-explaining-what-a-project-isPedro Moreira da Silva2017-09-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain what a project is instead of what a user can do
| | * | | | | | Merge branch '37789-followup-for-read-registry-change' into 'master'Rémy Coutable2017-09-187-20/+28
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up read_registry scope changes Closes #37789 See merge request gitlab-org/gitlab-ce!14307
| | | * | | | | | Clean up read_registry scope changesRobin Bobbitt2017-09-187-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #37789
| | * | | | | | | Merge branch 'docs-17499-documentation-errors-about-creating-a-new-tag' into ↵Achilleas Pipinellis2017-09-182-1/+6
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix docs for lightweight tag creation via API Closes #17499 See merge request gitlab-org/gitlab-ce!14328
| | | * | | | | | | Fix docs for lightweight tag creation via APIMark Fletcher2017-09-182-1/+6
| | | | | | | | | |
| | * | | | | | | | Merge branch 'fix-label-message' into 'master'Rémy Coutable2017-09-181-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix notification message when admin label was modified See merge request gitlab-org/gitlab-ce!14330
| | | * | | | | | | | Fix notification message when admin label was modifiedfix-label-messageRobert Schilling2017-09-181-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'update-user_uses_slash_commands_spec' into 'master'Rémy Coutable2017-09-181-4/+4
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor update to address Sean McGivern's comment. See merge request gitlab-org/gitlab-ce!14311
| | | * | | | | | | | | Minor update to address Sean McGivern's comment.manolis2017-09-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More details are available here https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13436/diffs#note_39115837
| | * | | | | | | | | | Merge branch 'replace_project_snippets.feature' into 'master'Rémy Coutable2017-09-187-135/+95
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/snippets.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14326
| | | * | | | | | | | | Replace the 'project/snippets.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-187-135/+95
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch '37957-fix-groups-members-flyout-link' into 'master'Phil Hughes2017-09-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use correct group members path for members flyout link Closes #37957 See merge request gitlab-org/gitlab-ce!14329
| | | * | | | | | | | | | Use correct group members path for members flyout link37957-fix-groups-members-flyout-linkkushalpandya2017-09-181-1/+1
| | | |/ / / / / / / / /
| | * | | | | | | | | | Merge branch 'fix_wiki_md' into 'master'Achilleas Pipinellis2017-09-181-0/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken link in docs/api/wiki.md See merge request gitlab-org/gitlab-ce!14296
| | | * | | | | | | | | | Fix broken link in docs/api/wiki.mdVitaliy @blackst0ne Klachkov2017-09-171-0/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'operation-service-merge' into 'master'Rémy Coutable2017-09-188-78/+76
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare Repository#merge for migration to Gitaly Closes gitaly#559 See merge request gitlab-org/gitlab-ce!14154
| | | * | | | | | | | | | | Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-158-78/+76
| | | | | | | | | | | | | |
View Lorry Controller Status