summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove unnecessary variablemk-fix-git-over-http-rejectionsMichael Kozono2017-06-051-3/+1
|
* Add changelog entryMichael Kozono2017-06-051-0/+4
|
* Extract and memoize `user_access`Michael Kozono2017-06-051-6/+9
| | | | Because it is sometimes never used.
* Remove GitAccessStatus (no longer needed)Michael Kozono2017-06-054-26/+9
|
* Refactor construction of responseMichael Kozono2017-06-052-14/+22
|
* Refactor to remove a special caseMichael Kozono2017-06-053-7/+29
|
* Fix would-be regressionMichael Kozono2017-06-051-3/+1
| | | | | | https://gitlab.com/gitlab-org/gitlab-ce/commit/57e3e942de1adef2c8621905370f07d7da7870c4 I changed it to a separate condition rather than depending on the order of the case-when statements to prevent this mistake again.
* Clarify error messagesMichael Kozono2017-06-053-13/+31
| | | | And refactor to self-document a little better.
* Refactor to let GitAccess errors bubble upMichael Kozono2017-06-059-203/+182
| | | | | | No external behavior change. This allows `GitHttpController` to set the HTTP status based on the type of error. Alternatively, we could have added an attribute to GitAccessStatus, but this pattern seemed appropriate.
* Refactor to let `GitAccess` check protocol configMichael Kozono2017-06-051-10/+0
| | | | This already works due to previous refactoring.
* Specify new Git-LFS-over-HTTP behaviorMichael Kozono2017-06-051-18/+20
| | | | | | Changes to `GitHttpClientController`’s authentication logic caused this behavior change. The old 401 Unauthorized statuses didn’t cause any harm, but they weren’t quite as accurate as the new behavior.
* Move CI access logic into GitAccessMichael Kozono2017-06-057-57/+198
|
* RefactorMichael Kozono2017-06-052-10/+6
|
* Check disabled commands in GitAccess insteadMichael Kozono2017-06-053-6/+68
|
* Render GitAccess message if authorizedMichael Kozono2017-06-051-5/+1
|
* Fix Git over HTTP specMichael Kozono2017-06-055-269/+419
| | | | | | | | | | | * The spec has 7 failures at this point * Specify rendered error messages * Render the GitAccess message rather than “Access denied” * Render the Not Found message provided by GitAccess, instead of a custom one * Expect GitAccess to check the config for whether Git-over-HTTP pull or push is disabled, rather than doing it in the controller * Add more thorough testing for authentication * Dried up a lot of tests * Fixed some broken tests
* Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-0520-30/+237
|\ | | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478
| * Fix up merge issuesfix-realtime-edited-text-for-issues-9-3Luke "Jared" Bennett2017-06-023-2/+7
| |
| * Merge remote-tracking branch 'origin/master' into ↵Luke "Jared" Bennett2017-06-02510-2512/+9152
| |\ | | | | | | | | | fix-realtime-edited-text-for-issues-9-3
| * | Removed unneeded newline in issuables_helper_spec and removed unneeded ↵Luke "Jared" Bennett2017-06-022-3/+1
| | | | | | | | | | | | updated_at_by variable in issuable_app_data
| * | Fixed issuables_helper_spec and added a test for issuable_app_dataLuke "Jared" Bennett2017-05-312-23/+49
| | |
| * | Remove EditableHelper and move method to IssuablesHelperLuke "Jared" Bennett2017-05-314-35/+30
| | |
| * | Correct editable_helper spec and format issuable_app_data updated_at to iso8061Luke "Jared" Bennett2017-05-312-3/+3
| | |
| * | Fix helper methods returning wrong data types for vueLuke "Jared" Bennett2017-05-312-3/+7
| | |
| * | Move issuable_app_data to helperLuke "Jared" Bennett2017-05-312-4/+9
| | |
| * | Review changes, improve editable helper spec and add hasUpdated computer to ↵Luke "Jared" Bennett2017-05-313-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_show app Fix builds by only merge when updated_at_by is presnse Fix issue_show app.vue hasUpdated reference to state Fix missing bracket
| * | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-3119-28/+241
| | |
* | | Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'Kamil Trzciński2017-06-054-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add slugified project path to CI environment variables Closes #31061 See merge request !11838
| * | | Add slugify project path to CI enviroment variablesvanadium232017-06-034-1/+8
| | | |
* | | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-0522-92/+430
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial implementation for real time job view Closes #31397 See merge request !11651
| * | | | retryable? is now available for CommitStatuszj-job-view-goes-real-timeZ.J. van de Weg2017-06-041-1/+6
| | | | |
| * | | | Fix test failuresKamil Trzcinski2017-06-034-9/+14
| | | | |
| * | | | Fix test failuresKamil Trzcinski2017-06-021-4/+2
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-02328-1735/+5166
| |\ \ \ \ | | |/ / /
| * | | | Add user to BuildDetailsEntityZ.J. van de Weg2017-06-025-9/+18
| | | | | | | | | | | | | | | | | | | | Also add minor changed needed to pass review
| * | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg2017-06-0151-57/+661
| |\ \ \ \
| * | | | | Rename build to jobZ.J. van de Weg2017-06-014-8/+8
| | | | | |
| * | | | | Incorporate reviewZ.J. van de Weg2017-05-3113-34/+106
| | | | | |
| * | | | | Create PipelineDetailsEntityZ.J. van de Weg2017-05-3111-110/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we have a PipelineEntity which is a bit smaller, mostly in bytes needing to send to the frontend. PipelineDetailsEntity is the default for the PipelineSerializer, limiting the changes needed. This commit also incorporates the review.
| * | | | | Initial implementation for real time job viewZ.J. van de Weg2017-05-3111-21/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the needed keys and paths to a new entity, BuildDetailsEntity. Not renaming BuildEntity to BuildBasicEntity on explicit request. Most code now has test coverage, but not all. This will be added on later commits on this branch. Resolves gitlab-org/gitlab-ce#31397
* | | | | | Merge branch 'sidekiq-transaction' into 'master'Sean McGivern2017-06-059-21/+91
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forbid Sidekiq scheduling in transactions Closes #27233 See merge request !9376
| * | | | | | Fix keys seedDouwe Maan2017-06-022-11/+24
| | | | | | |
| * | | | | | Don’t schedule workers from inside transactionsDouwe Maan2017-06-027-20/+32
| | | | | | |
| * | | | | | Allow scheduling from after_commit hooksDouwe Maan2017-06-021-9/+27
| | | | | | |
| * | | | | | Forbid Sidekiq scheduling in transactionsYorick Peterse2017-06-021-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scheduling jobs in transactions can lead to race conditions where a job runs before a transaction has been committed. The added initializer ensures the various Sidekiq scheduling methods raise an error when called inside a transaction. Fixes #27233
* | | | | | | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-0553-50/+1253
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConvDev Index Closes #30469 See merge request !11377
| * \ \ \ \ \ \ Merge branch '30469-convdev-index' of gitlab.com:gitlab-org/gitlab-ce into ↵30469-convdev-indexSimon Knox2017-06-033-4/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 30469-convdev-index
| | * | | | | | | Fix copyAdam Niedzielski2017-06-021-1/+1
| | | | | | | | |
| | * | | | | | | Use sum instead of map + injectAdam Niedzielski2017-06-022-3/+3
| | | | | | | | |
| * | | | | | | | fixup some classnames and media queriesSimon Knox2017-06-032-34/+16
| |/ / / / / / /
View Lorry Controller Status