summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-03119-294/+624
|\
| * Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' Douwe Maan2016-06-035-1/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "SHA parameter in accept merge request API" Add a `sha` parameter to the MR merge API, which must match the source SHA for the branch to be merged. Also add the same parameter to the UI: ![MR_SHA](/uploads/616da728695dc19fa7ef7ef6a016ff81/MR_SHA.gif) @DouweM and I discussed adding some smart feature to that, like updating the source SHA on navigating to the diff tab, but for now it will just require a refresh :smiley: Closes #14139. See merge request !4414
| | * fixup! Don't allow merges with new commits14139-sha-parameter-in-accept-merge-request-apiSean McGivern2016-06-021-2/+2
| | |
| | * Don't allow merges with new commitsSean McGivern2016-06-015-1/+16
| | | | | | | | | | | | | | | | | | Set a `sha` parameter on the MR form. If this doesn't match the HEAD of the source branch when the form is submitted, show a warning (like with a merge conflict) and don't merge the branch.
| * | Merge branch 'todos-filter-project-delete' into 'master' Douwe Maan2016-06-031-1/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure we don't show TODOS for projects pending delete ## What does this MR do? Joins the todos on the projects table in order to run the default scope. Also includes a where clause because the default scope is being removed soon. ## Are there points in the code the reviewer needs to double check? An alternative approach, more like the Issues page, would be to filter down the list by passing user.authorized_projects into the where clause. Or we could just be more defensive in the view when iterating. ## Why was this MR needed? Todos page throws 500 error for users with todos in a project pending deletion. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17813 cc\ @stanhu See merge request !4300
| | * | Reorder the todos because the use of the project finder attempts to order ↵DJ Mountney2016-06-021-2/+2
| | | | | | | | | | | | | | | | them differently
| | * | Use the project finder in the todos finder to limit todos to just ones ↵DJ Mountney2016-06-022-2/+13
| | | | | | | | | | | | | | | | within projects you have access to.
| | * | Move filtering todos by projects not pending deletion into a scope on the ↵DJ Mountney2016-06-022-7/+2
| | | | | | | | | | | | | | | | todo model
| | * | Reduce the filters on the todos joins project query by being explicit about ↵DJ Mountney2016-06-021-1/+7
| | | | | | | | | | | | | | | | the join
| | * | Ensure we don't show TODOS for projects pending deleteDJ Mountney2016-06-021-1/+1
| | | | | | | | | | | | | | | | By joining the Todos on the project table.
| * | | Merge branch '13312-remove-issuable-is_assigned' into 'master' Robert Speicher2016-06-031-4/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused Issuable#is_assigned? method Fixes #13312. See merge request !4440
| | * | | Remove unused Issuable#is_assigned? method13312-remove-issuable-is_assignedRémy Coutable2016-06-021-4/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Update tests to match new Code tab logicDmitriy Zaporozhets2016-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Put project Files and Commits tabs under Code tabDmitriy Zaporozhets2016-06-036-17/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Update repository_import_worker.rbJames Lopez2016-06-021-1/+1
| | | | |
| * | | | fix some issues and improved error output for forkingJames Lopez2016-06-022-2/+9
| | | | |
| * | | | some refactoring and fixing specJames Lopez2016-06-023-6/+8
| | | | |
| * | | | fix empty message on shell errorJames Lopez2016-06-021-1/+1
| | | | |
| * | | | fix create service error handling - missing setting import status to failedJames Lopez2016-06-021-6/+20
| | | | |
| * | | | Merge branch '18031-sidebar-labels-queries' into 'master' Yorick Peterse2016-06-022-5/+9
| |\ \ \ \ | | | | | | | | | | | | See merge request !4436
| | * | | | issuable#labels_array explicitly load the labelsPaco Guzman2016-06-022-5/+9
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This will be useful when you want to ask for the number of items and later iterate over them, without needing to ask if the association is load or not. So you avoid extra database queries
| * | | | Merge branch 'rs-todo-has-tooltip' into 'master' Dmitriy Zaporozhets2016-06-021-1/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Add tooltips to todo target links See merge request !4370
| | * | | Add tooltips to todo target linksrs-todo-has-tooltipRobert Speicher2016-05-301-1/+3
| | | | |
| * | | | Merge branch 'issue_18102' into 'master' Robert Speicher2016-06-021-2/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes missing number on generated ordered list Closes #18102 See merge request !4437
| | * | | | Fixes missing number on generated ordered listAlfredo Sumaran2016-06-021-2/+0
| | | | | |
| * | | | | Refactor. Add tests.Josh Frye2016-06-024-17/+4
| | | | | |
| * | | | | Invalidate cache on build changeJosh Frye2016-06-022-1/+6
| | | | | |
| * | | | | Cache project build count. Closes #18032Josh Frye2016-06-022-0/+15
| | |_|/ / | |/| | |
| * | | | Merge branch 'issue-18036' into 'master' Yorick Peterse2016-06-023-2/+27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cache assigned issue and merge request count. Closes #18036 and #18035 See merge request !4378
| | * | | | Update specs. Add CHANGELOG entryissue-18036Josh Frye2016-06-021-1/+1
| | | | | |
| | * | | | Flush cache in callback. Add testsJosh Frye2016-06-022-4/+17
| | | | | |
| | * | | | Cache assigned open issue count. Closes #18035Josh Frye2016-06-022-3/+9
| | | | | |
| | * | | | Cache assigned merge request count. Closes #18036Josh Frye2016-06-022-1/+7
| | |/ / /
| * | | | Merge branch 'search-box-blur' into 'master' Jacob Schatz2016-06-023-18/+15
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking search pill focuses field When clicking the pill in the search field, it now focus the field. Previously you would have to make sure you click in the field. Fixed an issue where clicking out of the field wouldn't remove the focus outline Also reduced some of the HTML to remove what isn't needed See merge request !4279
| | * | | Clicking search pill focuses fieldsearch-box-blurPhil Hughes2016-05-243-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking the pill in the search field, it now focus the field. Previously you would have to make sure you click in the field. Fixed an issue where clicking out of the field wouldn't remove the focus outline Also reduced some of the HTML to remove what isn't needed
| * | | | Merge branch '14446-no_group_avatar-png-link' into 'master' Rémy Coutable2016-06-021-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to blank group icon When the group is the default blank icon, this needs to use the `image_path` helper; otherwise, the link won't work if assets are precompiled. This still works fine for uploaded icons in either case. Closes #14446. See merge request !4375
| | * | | | Fix link to blank group iconSean McGivern2016-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the group is the default blank icon, this needs to use the `image_path` helper; otherwise, the link won't work if assets are precompiled. This still works fine for uploaded icons in either case.
| * | | | | Fix wiki project clone address errorchujinjin/gitlab-ce-fix_wiki_project_clone_address_errorchujinjin2016-06-021-1/+1
| |/ / / /
| * | | | Fix indentationConnor Shea2016-06-011-6/+6
| | | | |
| * | | | Attempt to fix the user page.Connor Shea2016-06-019-1/+10
| | | | |
| * | | | Remove d3 except for on pages where it's necessary.Connor Shea2016-06-019-5/+25
| | | | |
| * | | | Merge branch 'fix-dropdown-cutoff' into 'master' Robert Speicher2016-06-021-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a `title` attribute to the branch dropdown for when the name has been cut off. Fixes #18056 See merge request !4395
| | * | | | Add a title attribute to each branch in the branches dropdown on the New MR ↵Connor Shea2016-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | page.
| * | | | | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-024-4/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade devise, devise-two-factor, and attr_encrypted Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support. attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future. See merge request !4216
| | * | | | | Upgrade attr_encrypted and encryptorConnor Shea2016-05-303-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr_encrypted (1.3.4 => 3.0.1) Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.m d attr_encrypted 2.x included a vulnerability, so that major version is skipped. 3.x requires that the algorithm and mode used by each encrypted attribute is specified explicitly. `nil` is no longer a valid value for the encrypted_value_iv field, so it’s changed to a randomly generated string.
| | * | | | | Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-302-2/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devise (3.5.4 => 4.1.1) Changelog: https://github.com/plataformatec/devise/blob/master/CHANGELOG.md devise-two-factor (2.0.1 => 3.0.0) Changelog: https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md These are reliant on each other, so they have to be upgraded together. devise-async is no longer necessary as Devise 4.1 fixes a bug with the ActiveJob integration.
| * | | | | Merge branch 'downcase-registry-repository' into 'master' Stan Hu2016-06-011-3/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use downcased path to container repository as this is expected path by Docker ## What does this MR do? Docker Engine requires path to be lowercase. This makes all container registry paths to be show and used downcased instead of mixed case. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17959 See merge request !4420
| | * | | | | Introduce container_registry_path_with_namespacedowncase-registry-repositoryKamil Trzcinski2016-06-011-3/+7
| | | | | | |
| | * | | | | Merge remote-tracking branch 'origin/master' into downcase-registry-repositoryKamil Trzcinski2016-06-011-1/+24
| | |\ \ \ \ \
| | * | | | | | Use downcased path to container repository as this is expected path by DockerKamil Trzcinski2016-06-011-3/+3
| | | |_|_|_|/ | | |/| | | |
View Lorry Controller Status