summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed issue when images are loading it would push off the tabsfixed-mr-tabs-fixesPhil Hughes2016-10-201-2/+8
|
* Fixed issues with sticky mr tabs & sidebarPhil Hughes2016-10-204-46/+54
| | | | Closes #23504
* Merge branch 'pass-namespace-gitlab-project-import' into 'master' Stan Hu2016-10-202-25/+29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitLab project import when a user has access only to their default namespace ## What does this MR do? It fixes a bug when a namespace ID was not passed to `/import/gitlab_project/new` page. It occurred when a user have no choice of the namespace, so we did not render the input for namespace ID. This MR introduces a hidden input for the described case. ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #23507 See merge request !6995
| * Fix GitLab project import when a user has access only to their default ↵pass-namespace-gitlab-project-importAdam Niedzielski2016-10-201-0/+1
| | | | | | | | | | | | | | namespace. Render a hidden field with namespace ID so it can be read by JavaScript and passed to "/import/gitlab_project/new" screen.
| * Test GitLab project import for a user with only their default namespace.Adam Niedzielski2016-10-201-25/+28
| | | | | | | | | | | | | | | | Refactor the spec file: - remove hardcoded record IDs - avoid top-level let if not used in all scenarios - prefer expect { ... }.to change { ... }.from(0).to(1) over checking that there are no records at the beginning of the test
* | Merge branch 'protected-branches-bundle' into 'master' Jacob Schatz2016-10-208-0/+4
|\ \ | | | | | | | | | | | | | | | | | | Create protected branches bundle Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/645 See merge request !6909
| * | Create protected branches bundleAlfredo Sumaran2016-10-208-0/+4
| | |
* | | Merge branch 'zj-use-iid-deployment-refs' into 'master' Kamil Trzciński2016-10-203-5/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Use iid deployment refs This fixes the 404, because `find_by` will return nil instead of throwing an error. See merge request !7021
| * | Only create refs for new deploymentszj-use-iid-deployment-refsZ.J. van de Weg2016-10-201-1/+1
| | | | | | | | | | | | | | | | | | This patch makes sure GitLab does not save the refs to the filesystem each time the deployment is updated. This will save some IO although I expect the impact to be minimal.
| * | Use deployment IID when saving refsZ.J. van de Weg2016-10-203-4/+4
| | |
* | | Merge branch 'preserve-note_type-and-position' into 'master' Sean McGivern2016-10-205-16/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Preserve note_type and position for notes from emails Closes #23208 See merge request !7010
| * \ \ Merge remote-tracking branch 'upstream/master' into ↵preserve-note_type-and-positionLin Jen-Shin2016-10-2027-99/+275
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preserve-note_type-and-position * upstream/master: Restrict ProjectCacheWorker jobs to one per 15 min Removed code from project members controller Make label API spec independent of order Refactoring find_commits functionality Differentiate the expire from leave event Remove pagination description from individual doc Fix a broken table in Project API doc Create project feature when project is created Simpler arguments passed to named_route on toggle_award_url helper method Fixed height of issue board blank state
| * | | | We want to release this in 8.13.0Lin Jen-Shin2016-10-201-2/+1
| | | | |
| * | | | Add CHANGELOG entry [ci skip]Lin Jen-Shin2016-10-201-0/+2
| | | | |
| * | | | Preserve note_type and position for notes from emailsLin Jen-Shin2016-10-204-16/+16
| | | | | | | | | | | | | | | | | | | | Closes #23208
* | | | | Merge branch 'update-duration-at-the-end-of-pipeline' into 'master' Rémy Coutable2016-10-202-3/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update duration at the end of pipeline ## What does this MR do? Moves duration calculation to be done only once at the end of pipeline processing. Currently this is done every one build. ## Why was this MR needed? This is the simplest thing that we can do before properly implementing duration calculation: https://gitlab.com/gitlab-org/gitlab-ce/issues/23523#note_17145614 This is ~Performance improvement that significantly affects: http://performance.gitlab.net/dashboard/db/sidekiq-workers?var-worker=PipelineUpdateWorker%23perform&var-database=Production&from=now-1h&to=now See merge request !6987
| * | | | | Update duration at the end of pipelineupdate-duration-at-the-end-of-pipelineKamil Trzcinski2016-10-202-3/+1
| | | | | |
* | | | | | Merge branch 'render-hipchat-notification-descriptions' into 'master' Rémy Coutable2016-10-203-30/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render HipChat notification descriptions as HTML instead of raw markdown ## What does this MR do? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1621 for issues, merge requests and comments. ## Are there points in the code the reviewer needs to double check? This MR is small enough to double check everything. ## Why was this MR needed? Because seeing raw markdown in HipChat notifications is not nice :) See merge request !6371
| * | | | | | Add CHANGELOG.md entryAirat Shigapov2016-10-201-0/+1
| | | | | | |
| * | | | | | Return truncation for notification descriptions, fix minor bugs with renderingAirat Shigapov2016-10-202-12/+17
| | | | | | |
| * | | | | | Use guard clause instead of if-else statementAirat Shigapov2016-10-201-13/+12
| | | | | | |
| * | | | | | Tests for markdown HipChat notificationsDavid Eisner2016-10-201-6/+6
| | | | | | |
| * | | | | | Clean up Banzai HTML for HipChatDavid Eisner2016-10-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `class` and `data-*` attributes are meaningless in HipChat, and it would probably be better to limit the tags, too. For example, we could avoid block-level elements in `render_line`.
| * | | | | | Ensure absolute URLs for single lines from Banzai for HipChatDavid Eisner2016-10-201-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "pipeline: :single_line" leaves the protocol/host part out of the URLs and caches them that way. To avoid giving those out to HipChat, markdown is always rendered with "pipeline: :email" first. There must be a better way to do this, but I can't see how to avoid the link caching.
| * | | | | | Absolute URLs for Banzai HTML for HipChatDavid Eisner2016-10-201-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using "pipeline: :email" gets "only_path: false" into the context to produce full URLs instead of /namespace/project/...
| * | | | | | Also render commit titles in HipChat notificationsDavid Eisner2016-10-201-4/+8
| | | | | | |
| * | | | | | Full Banzai rendering for HipChat notificationsDavid Eisner2016-10-201-11/+3
| | | | | | |
| * | | | | | Render hipchat notification descriptions as HTML instead of raw markdownAirat Shigapov2016-10-202-16/+13
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '23341-fix-viewing-mr-from-deleted-project' into 'master' Douwe Maan2016-10-207-70/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a 500 error viewing an MR with a deleted source project ## What does this MR do? Allows merged MRs to be shown without any 500 errors if the source project is removed ## Are there points in the code the reviewer needs to double check? https://gitlab.com/gitlab-org/gitlab-ce/commit/31c37c6c38258684fc92e0d91119c33872e39034 fixed this for closed MRs only. I had trouble understanding the introduced helper and logic, so reverted it and keyed everything on the existence of the source project or branch directly. commits.json returns a 500 error for a closed or merged MR; the approach taken in the above MR was to hide the commits... tab, so I've run with that. For merged MRs, the commits (but not the pipeline data) are in the target project, so we *could* do better, but it's a fairly nasty intervention to make it happen. ## Why was this MR needed? Viewing merged MRs should work even if the fork they came from has been deleted or unlinked. ## Screenshots (if relevant) ![Screen_Shot_2016-10-19_at_17.56.37](/uploads/1aeadd5147b9a4ad29b946b1c7ea52cb/Screen_Shot_2016-10-19_at_17.56.37.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23341 See merge request !6991
| * | | | | | Update changelogNick Thomas2016-10-201-0/+1
| | | | | | |
| * | | | | | Rename forked_source_project_missing? to source_project_missing?Nick Thomas2016-10-202-7/+7
| | | | | | |
| * | | | | | Fix two CI endpoints for MRs where the source project is deletedNick Thomas2016-10-201-1/+1
| | | | | | |
| * | | | | | Fix the merge request view when source projects or branches are removedNick Thomas2016-10-205-18/+36
| | | | | | |
| * | | | | | Revert "Add #closed_without_source_project?"Nick Thomas2016-10-203-57/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 31c37c6c38258684fc92e0d91119c33872e39034. See #23341
* | | | | | | Merge branch '22089-show-full-job-name-on-hover-on-pipeline-graph' into ↵Annabel Dunstone Gray2016-10-204-13/+20
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add tooltip with jobs full name to pipelines graph ## What does this MR do? This MR adds a tooltip to build items in the pipelines graph as some build names are truncated. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Some job names that are truncated need to be fully identified to avoid confusion. ## Screenshots (if relevant) [Latest screenies here!](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6403#note_16968703). ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22089 See merge request !6403
| * | | | | | Added dyanmic position adjustment22089-show-full-job-name-on-hover-on-pipeline-graphLuke Bennett2016-10-197-27/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tooltips for dropdown items Reverted pretty much everything in favour of a DOM approach Simplified JS
| * | | | | | Added tooltip with jobs full name to build items in graphLuke Bennett2016-10-183-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added status to build tooltip and removed status icon tooltip Added Pipelines class to force tooltips ontop of the dropdown, we cannot do this with data attributes because dropdown toggle is already set Corrected dispatcher invocation
* | | | | | | Merge branch 'unrevert-tab-order-MR' into 'master' Annabel Dunstone Gray2016-10-202-2/+19
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change input order on Sign In form for better tabbing. ## What does this MR do? This unreverts 8751491b, which was mistakenly reverted in !6328. It also changes the implementation of the original commit to work with the new login styling and markup. cc: @ClemMakesApps ## Screenshots (if relevant) (Disregard the grey borders on invalid inputs -- for some reason, Gifox isn't picking up some colors for me :shrug: ) ![2016-10-17_11.32.05](/uploads/f395b2d77fb47cac3f9d4fa1bc3d7d71/2016-10-17_11.32.05.gif) ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867 See merge request !6928
| * | | | | | Change input order on Sign In form for better tabbing.unrevert-tab-order-MRClement Ho2016-10-202-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This *unreverts* 8751491b, which was mistakenly reverted in !6328. It also changes the implementation of the original commit to work with the new login styling and markup. cc: @ClemMakesApps
* | | | | | | Merge branch 'project-cache-worker-lease' into 'master' Rémy Coutable2016-10-203-11/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict ProjectCacheWorker jobs to one per 15 min ## What does this MR do? This restricts performing ProjectCacheWorker jobs to once every 15 minutes per project. The goal of this is to reduce disk load in the event of a lot of pushes happening in a short period of time. The impact is that cached data (e.g. commit count) may be updated less frequently. Furthermore it could mean that separate push payloads won't lead to e.g. READMEs being updated. Most of the cached data isn't updated very frequently, so this trade off should be worth it considering the alternative is a burning storage layer. In the future we'll have to flush caches in a smarter way. For example, refreshing the README cache could probably be done separately from the other caches with its own lease and such. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23550 for more information. See merge request !7017
| * | | | | | | Restrict ProjectCacheWorker jobs to one per 15 minproject-cache-worker-leaseYorick Peterse2016-10-203-11/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures ProjectCacheWorker jobs for a given project are performed at most once per 15 minutes. This should reduce disk load a bit in cases where there are multiple pushes happening (which should schedule multiple ProjectCacheWorker jobs).
* | | | | | | | Merge branch 'remove-unused-code-project-members-controller' into 'master' Dmitriy Zaporozhets2016-10-201-15/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed code from project members controller ## What does this MR do? Removes code that was meant to be added to a different branch as an experiment. See merge request !7012
| * | | | | | | | Removed code from project members controllerPhil Hughes2016-10-201-15/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This code was meant to be added to another branch as an expirement, but instead was commited to wrong branch
* | | | | | | | Merge branch 'fix-label-api-spec' into 'master' Douwe Maan2016-10-201-2/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Make label API spec independent of order See merge request !7013
| * | | | | | | Make label API spec independent of orderDouwe Maan2016-10-201-2/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'issue_22944' into 'master' Sean McGivern2016-10-205-10/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create project feature when project is created closes #22944 See merge request !6908
| * | | | | | | Create project feature when project is createdissue_22944Felipe Artur2016-10-195-10/+42
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'refactoring_find_commits_method' into 'master' Sean McGivern2016-10-203-9/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring find_commits method It's possible that `find_commits_by_message` return nil in array which is not OK. We have different checks outside of this method. This MR places all checks inside the method. See merge request !7000
| * | | | | | Refactoring find_commits functionalityValery Sizov2016-10-203-9/+8
| | | | | | |
* | | | | | | Merge branch '23555-project-api-doc' into 'master' Rémy Coutable2016-10-202-4/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Breaking a parameter table in Projects API doc" ## What does this MR do? - A broken markdown in `Search for projects by name` is fixed. - cf. !6681 - Pagination is removed from `Search for projects by name` like other docs as it is shown in [/api/README.html](https://docs.gitlab.com/ce/api/README.html) ## Moving docs to a new location? No. ## What are the relevant issue numbers? Closes #23555 See merge request !7007