summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WIP: Find unused CSSfeature/find-unused-cssEric Eastwood2017-09-227-13/+407
|
* Merge branch '33287-fix-mr-widget-errors-with-external-services' into 'master'Fatih Acet2017-09-1910-25/+157
|\ | | | | | | | | | | | | Fix MR widget with external CI services/integrations Closes #33287 See merge request gitlab-org/gitlab-ce!13977
| * Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-servicesEric Eastwood2017-09-1810-25/+157
|/ | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287 The MR widget was trying to render the pipelines section when there are no GitLab CI pipelines which was throwing some NPE errors.
* Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'Fatih Acet2017-09-184-3/+16
|\ | | | | | | | | | | | | Fix MR widget with ready to merge buttons/controls at mobile breakpoint Closes #37259 See merge request gitlab-org/gitlab-ce!14242
| * Fix MR ready to merge buttons/controls at mobile breakpoint37259-some-mr-ready-mobile-fixesEric Eastwood2017-09-134-3/+16
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37259
* | Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'Annabel Dunstone Gray2017-09-183-2/+12
|\ \ | | | | | | | | | | | | | | | | | | Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved Closes #37465 See merge request gitlab-org/gitlab-ce!14255
| * | Update line-resolve-all checkmark to be green when all discussions resolved37465-fix-line-resolve-all-green-checkmark-iconEric Eastwood2017-09-133-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37465 Related MRs - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13821 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14042
* | | Merge branch '35290_allow_public_project_apis' into 'master'Rémy Coutable2017-09-184-6/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix #35290 Make read-only API for public merge requests available without authentication Closes #35290 See merge request gitlab-org/gitlab-ce!13291
| * | | fix #35290 Make read-only API for public merge requests available without ↵haseeb2017-09-184-6/+40
|/ / / | | | | | | | | | authentication
* | | Merge branch 'add_closed_at_attribute' into 'master'Rémy Coutable2017-09-185-2/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add 'closed_at' attribute to Issues API Closes #5935 See merge request gitlab-org/gitlab-ce!14316
| * | | Add 'closed_at' attribute to Issues APIVitaliy @blackst0ne Klachkov2017-09-165-2/+26
| | | |
* | | | 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
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix-dev-ssl' into 'master'Grzegorz Bizon2017-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Never connect to webpack-dev-server over SSL in dev mode See merge request gitlab-org/gitlab-ce!14297
| * | | | | | | | | | | | | | Never connect to webpack-dev-server over SSLfix-dev-sslAlessio Caiazza2017-09-151-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '24121_extract_yet_another_users_finder' into 'master'Grzegorz Bizon2017-09-184-40/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract AutocompleteController#users into finder Closes #24121 See merge request gitlab-org/gitlab-ce!13778
| * | | | | | | | | | | | | | add Mayra Cabrera to authors of changeMaxim Rydkin2017-09-101-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | move `find_users` method into finder and add `load_group` methodMaxim Rydkin2017-09-103-28/+58
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | rename yet_another_users_finder into autocomplete_users_finderMaxim Rydkin2017-09-103-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix rubocopMaxim Rydkin2017-09-101-8/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | adds changelogMaxim Rydkin2017-09-101-0/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | finish spec/finders/yet_another_users_finder_spec.rbMaxim Rydkin2017-09-101-54/+42
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | extract finder and add first testMaxim Rydkin2017-09-103-22/+129
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'replace_project_commits_revert.feature' into 'master'Rémy Coutable2017-09-184-73/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/commits/revert.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14325
| * | | | | | | | | | | | | | | Replace the 'project/commits/revert.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-184-73/+61
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'replace_project_archived.feature' into 'master'Rémy Coutable2017-09-184-66/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/archived.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14322