summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'finding-multiple-projects-by-paths' into 'master' Robert Speicher2016-06-102-11/+93
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Project.where_paths_in In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4410 I'm working on reducing the SQL queries needed to render Markdown. One reason for the large amount of queries is executing a large number of queries needed to find projects and related data. Basically `Project.find_with_namespace` is called in a loop and then any relations have to be retrieved separately. By using `Project.where_paths_in` we can work around this by doing something like: ```ruby project_paths = [...] # populated by some method projects = Project.where_paths_in(project_paths).includes(:namespace, ...) ``` Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/18042 See merge request !4535
| * Add Project.where_paths_infinding-multiple-projects-by-pathsYorick Peterse2016-06-102-11/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method can be used to find multiple projects for multiple paths. For example, take this snippet: Project.where_paths_in(%w{gitlab-org/gitlab-ce gitlab-org/gitlab-ee}) This will return an ActiveRecord::Relation containing the GitLab CE and GitLab EE projects. This method takes care of matching rows both case-sensitively and case-insensitively where needed. Project.find_with_namespace in turn has been modified to use Project.where_paths_in without nuking any scoping (instead it uses reorder(nil)). This means that any default scopes (e.g. those used for "pending_delete" stay intact). The method Project.where_paths_in was added so the various Markdown filters can use a single query to grab all the projects referenced in a set of documents, something Project.find_with_namespace didn't allow.
* | Merge branch 'changelog-search-arrow-keys' into 'master' Robert Speicher2016-06-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Changelog fix for search dropdown arrow keys fix [ci skip] See merge request !4580
| * | Changelog fix for search dropdown arrow keys fixchangelog-search-arrow-keysPhil Hughes2016-06-101-1/+1
| | |
* | | Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' ↵Robert Speicher2016-06-101-8/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove unused MergeRequest#gitlab_merge_status method Closes #18462. See merge request !4593
| * | | Remove unused MergeRequest#gitlab_merge_status methodRémy Coutable2016-06-101-8/+0
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'labels-placement' into 'master' Dmitriy Zaporozhets2016-06-1011-105/+127
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Labels and Milestones as sub tab to Issues/MR ## What does this MR do? UI/UX change. Moves project labels and milestone tabs under Issues and Merge request tabs. ## Why was this MR needed? To solve problem of having to many tabs in top navigation. Since Labels and Milestones depends on Issue/MR feature it belongs to it and can be removed from top nav. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18368 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - not needed - [x] API support added - not needed - [x] Tests - [x] Added for this feature/bug - changed existing tests to match new behaviour - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) cc @jschatz1 @annabeldunstone @skyruler See merge request !4592
| * | | Add CHANGELOG item for labels/milestones navigation changeDmitriy Zaporozhets2016-06-101-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Render issues link on issues subnav unless you visit merge request controllerDmitriy Zaporozhets2016-06-101-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Render only issues/mr in subnav depends on contextDmitriy Zaporozhets2016-06-105-17/+21
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Move Labels and Milestones as sub tab to Issues/MRDmitriy Zaporozhets2016-06-107-90/+107
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-1014-34/+61
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add workhorse controller and API helpers Adds `send_git_blob` and `send_git_archive` controller and API helpers to reduce duplication and make Workhorse easier for a developer to work with. See merge request !4486
| * | | Satisfy Rubocopworkhorse-helpersDouwe Maan2016-06-101-2/+2
| | | |
| * | | Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-10175-950/+2237
| |\ \ \ | | |/ /
| * | | Add send_git_diff helperDouwe Maan2016-06-08231-2052/+5316
| |\ \ \
| * | | | Move changelog itemDouwe Maan2016-06-061-1/+1
| | | | |
| * | | | Add changelog itemDouwe Maan2016-06-061-0/+1
| | | | |
| * | | | Add workhorse controller and API helpersDouwe Maan2016-06-0612-24/+45
| | | | |
* | | | | Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-1016-247/+305
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI build page UI update Closes #2569 See merge request !3829
| * | | | | Updated testsci-page-ui-updatePhil Hughes2016-06-101-1/+1
| | | | | |
| * | | | | Fixed merge conflict that caused tests to fail with buildPhil Hughes2016-06-101-1/+1
| | | | | |
| * | | | | Fixed failing testsPhil Hughes2016-06-101-2/+4
| | | | | |
| * | | | | CI build page UI updatePhil Hughes2016-06-1016-250/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added sidebar Removed elements not present in design
* | | | | | Merge branch 'icon-color-fix' into 'master' Jacob Schatz2016-06-102-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update activity SVG path ## What does this MR do? Fixes SVG path so the activity icon is the correct color ## Screenshots (if relevant) <img src="/uploads/ea948338ea816890851a8011b8b3255f/Screen_Shot_2016-06-09_at_8.43.05_AM.png" width="600px"> See merge request !4563
| * | | | | | Update activity SVG pathicon-color-fixAnnabel Dunstone2016-06-092-8/+8
| | | | | | |
* | | | | | | Merge branch 'prettier-awardable-button-active' into 'master' Jacob Schatz2016-06-101-1/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made the awardable buttons prettier when active ## What does this MR do? Made the active and hover state of the award emoji buttons prettier. ## Why was this MR needed? 'cause @JobV wanted them to look nicer :wink: ## What are the relevant issue numbers? Closes #18379 ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_09.10.44](/uploads/5ecd0f12679e3484de1ab1d2dbe50cd8/Screen_Shot_2016-06-09_at_09.10.44.png) See merge request !4554
| * | | | | | | Made the awardable buttons prettier when activeprettier-awardable-button-activePhil Hughes2016-06-101-1/+9
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Closes #18379
* | | | | | | Merge branch 'label-create-error-messages' into 'master' Jacob Schatz2016-06-101-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly shows label errors in dropdown ## What does this MR do? Correctly shows any errors in the dropdown when creating a new label ## What are the relevant issue numbers? Closes #18344 ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_09.01.59](/uploads/58dc56b39db20a50adce6f12510025fc/Screen_Shot_2016-06-09_at_09.01.59.png) See merge request !4553
| * | | | | | | Correctly shows label errors in dropdownlabel-create-error-messagesPhil Hughes2016-06-101-1/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #18344
* | | | | | | Merge branch 'user-search-dropdown' into 'master' Jacob Schatz2016-06-102-40/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert change to search all users ## What does this MR do? Reverts a change that allowed the user to search for all users in the author/assignee dropdown ## Are there points in the code the reviewer needs to double check? Double check it isn't still searching all users See merge request !4564
| * | | | | | | removed tests needed for any author :poop:user-search-dropdownPhil Hughes2016-06-101-36/+0
| | | | | | | |
| * | | | | | | Revert change to search all usersPhil Hughes2016-06-101-4/+4
| |/ / / / / /
* | | | | | | Merge branch 'project-dropdown-position-fix' into 'master' Jacob Schatz2016-06-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed project dropdown being overlapped by sidebar ## What does this MR do? Changes the header expanded `padding` to `margin` to prevent the project dropdown from overlapping. ## What are the relevant issue numbers? Closes #18410 ## Screenshots (if relevant) ![Screen_Shot_2016-06-10_at_10.38.00](/uploads/b569d6d4cbd126fd776cf849ebc1137d/Screen_Shot_2016-06-10_at_10.38.00.png) See merge request !4583
| * | | | | | | Fixed project dropdown being overlapped by sidebarproject-dropdown-position-fixPhil Hughes2016-06-101-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Closes #18410
* | | | | | | Merge branch 'label-filter-fix' into 'master' Jacob Schatz2016-06-104-4/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue where label filtering didnt work ## What does this MR do? The filterable option was missing which meant labels in the dropdown couldn't be filtered. This fixes that. ## What are the relevant issue numbers? Closes #18375 See merge request !4556
| * | | | | | | Added testslabel-filter-fixPhil Hughes2016-06-093-3/+18
| | | | | | | |
| * | | | | | | Fixed issue where label filtering didnt workPhil Hughes2016-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18375
* | | | | | | | Merge branch 'rename-ci-commit-phase-4' into 'master' Rémy Coutable2016-06-105-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Commit to Pipeline in TriggerRequest Changes in TriggerRequest a `commit` to `pipeline`. See merge request !4505
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-4Kamil Trzcinski2016-06-10410-336/+915
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Fix expose of TriggerRequestKamil Trzcinski2016-06-101-1/+1
| | | | | | | | |
| * | | | | | | | Fix CI TriggerRequest entityrename-ci-commit-phase-4Kamil Trzcinski2016-06-091-1/+1
| | | | | | | | |
| * | | | | | | | Rename commit to pipeline in TriggerRequestKamil Trzcinski2016-06-094-4/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-registry-docs' into 'master' Achilleas Pipinellis2016-06-102-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect registry key value See merge request !4595
| * | | | | | | | | Fix incorrect registry key valueAchilleas Pipinellis2016-06-102-3/+3
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18441
* | | | | | | | | Merge branch '18027-cache-project-external_issue_tracker' into 'master' Yorick Peterse2016-06-1010-7/+137
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache the presence of an issue_tracker at project level See merge request !4466
| * | | | | | | | | Fixing specs stubbed objects cannot access databasePaco Guzman2016-06-103-4/+4
| | | | | | | | | |
| * | | | | | | | | Cache the presence of an issue_tracker at project levelPaco Guzman2016-06-107-3/+133
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using update_column to store the boolean flag to avoid any side effects with the current state of the project instance
* | | | | | | | | Merge branch 'fix/incremental-trace-update-api' into 'master' Rémy Coutable2016-06-102-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix UTF-8 handling in incremental trace update API ## What does this MR do? This MR fixes invalid UTF-8 handling in incremental trace update API (used by GitLab Runner). ## Why was this MR needed? Current version is using `.length` method to determine current trace size where Runner is using the trace size in bytes. Also this byte size is used in headers and file operations to agree the trace part to send. This is a problem when build trace contains any multi-byte UTF-8 characters. This MR is fixing this situation so all parts are using the same size in bytes. ### Runner -> API communication before fix: ``` Checking for builds... received runner=_token_ gitlab-ci-multi-runner 1.3.0~beta.26.gcfd63b9 (cfd63b9) build=25 runner=_token_ Using Docker executor with image debian:jessie ... build=25 runner=_token_ Pulling docker image debian:jessie ... build=25 runner=_token_ 25 Submitting build to coordinator... ok runner=_token_ 25 Appending trace to coordinator... ok RemoteRange=0-158 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=0-158 runner=_token_ 25 Appending trace to coordinator... ok RemoteRange=0-491 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=158-505 runner=_token_ WARNING: 25 Appending trace to coordinator... range missmatch RemoteRange=0-491 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=505-584 runner=_token_ WARNING: 25 Resending trace patch due to range missmatch runner=_token_ 25 Appending trace to coordinator... ok RemoteRange=0-556 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=491-584 runner=_token_ WARNING: 25 Appending trace to coordinator... range missmatch RemoteRange=0-556 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=584-663 runner=_token_ WARNING: 25 Resending trace patch due to range missmatch runner=_token_ 25 Appending trace to coordinator... ok RemoteRange=0-621 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=556-663 runner=_token_ Build succeeded build=25 runner=_token_ WARNING: 25 Appending trace to coordinator... range missmatch RemoteRange=0-621 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=663-797 runner=_token_ WARNING: 25 Resending trace patch due to range missmatch runner=_token_ 25 Appending trace to coordinator... ok RemoteRange=0-741 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=621-797 runner=_token_ 25 Submitting build to coordinator... ok runner=_token_ ``` ### Runner -> API communication after fix: ``` Checking for builds... received runner=_token_ gitlab-ci-multi-runner 1.3.0~beta.26.gcfd63b9 (cfd63b9) build=26 runner=_token_ Using Docker executor with image debian:jessie ... build=26 runner=_token_ Pulling docker image debian:jessie ... build=26 runner=_token_ 26 Submitting build to coordinator... ok runner=_token_ 26 Appending trace to coordinator... ok RemoteRange=0-158 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=0-158 runner=_token_ 26 Appending trace to coordinator... ok RemoteRange=0-505 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=158-505 runner=_token_ 26 Appending trace to coordinator... ok RemoteRange=0-584 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=505-584 runner=_token_ 26 Appending trace to coordinator... ok RemoteRange=0-663 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=584-663 runner=_token_ Build succeeded build=26 runner=_token_ 26 Submitting build to coordinator... ok runner=_token_ ``` See merge request !4541
| * | | | | | | | | Update CHANGELOGTomasz Maczukin2016-06-101-0/+1
| | | | | | | | | |
| * | | | | | | | | Fix UTF-8 handling in incremental trace update APITomasz Maczukin2016-06-101-2/+2
| |/ / / / / / / /