Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix notes on confidential issues through JSON to users without access | Douglas Barbosa Alexandre | 2016-06-14 | 2 | -1/+17 |
* | Merge branch '17298-wiki-xss' into 'master' | Robert Speicher | 2016-06-14 | 1 | -0/+3 |
|\ | |||||
| * | Forbid scripting for wiki files | Sean McGivern | 2016-06-14 | 1 | -0/+3 |
* | | Merge branch '18449-instrument-grape-endpoints' into 'master' | Yorick Peterse | 2016-06-14 | 2 | -1/+53 |
|\ \ | |||||
| * | | Instrument Grape Endpoint with Metrics::RackMiddleware18449-instrument-grape-endpoints | Paco Guzman | 2016-06-14 | 2 | -1/+53 |
* | | | Merge branch '18527-instrument-private-methods' into 'master' | Yorick Peterse | 2016-06-14 | 5 | -13/+63 |
|\ \ \ | |||||
| * | | | Instrument private/protected methods | Paco Guzman | 2016-06-14 | 5 | -13/+63 |
* | | | | Merge branch 'settings-dropdown-permissions' into 'master' | Dmitriy Zaporozhets | 2016-06-14 | 2 | -49/+50 |
|\ \ \ \ | |||||
| * | | | | Pass can_edit and access to partial. | Connor Shea | 2016-06-13 | 2 | -3/+1 |
| * | | | | Fix a bug that allowed Guests to still see Settings links they couldn't access. | Connor Shea | 2016-06-10 | 1 | -1/+2 |
| * | | | | Fix displaying of project settings links the user cannot access. | Connor Shea | 2016-06-10 | 2 | -48/+50 |
* | | | | | Merge branch 'artifacts-expire-date' into 'master' | Rémy Coutable | 2016-06-14 | 27 | -265/+712 |
|\ \ \ \ \ | |||||
| * | | | | | Fix Ci::Build#artifacts_expire_in= when assigning invalid durationartifacts-expire-date | Kamil Trzcinski | 2016-06-14 | 1 | -1/+1 |
| * | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-date | Kamil Trzcinski | 2016-06-14 | 25 | -122/+824 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into artifacts-expire-date | Kamil Trzcinski | 2016-06-14 | 47 | -214/+372 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Fix specs | Kamil Trzcinski | 2016-06-14 | 4 | -24/+28 |
| * | | | | | | Fix keep action of build artifacts widget | Kamil Trzcinski | 2016-06-13 | 1 | -1/+1 |
| * | | | | | | Update db/schema.rb | Kamil Trzcinski | 2016-06-13 | 1 | -6/+6 |
| * | | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-date | Kamil Trzcinski | 2016-06-13 | 4 | -5/+32 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Improve ExpireBuildArtifactsWorker spec | Kamil Trzcinski | 2016-06-13 | 1 | -9/+4 |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-date | Kamil Trzcinski | 2016-06-13 | 26 | -178/+621 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Improve tests | Kamil Trzcinski | 2016-06-13 | 3 | -18/+12 |
| * | | | | | | | | Fixed spacing with row below in build sidebar | Phil Hughes | 2016-06-13 | 1 | -1/+1 |
| * | | | | | | | | Added documentation to artifacts expire | Kamil Trzcinski | 2016-06-13 | 2 | -1/+36 |
| * | | | | | | | | Improve design based on review | Kamil Trzcinski | 2016-06-13 | 9 | -292/+296 |
| * | | | | | | | | Added missing span element around time | Phil Hughes | 2016-06-13 | 1 | -3/+3 |
| * | | | | | | | | Improve after review | Kamil Trzcinski | 2016-06-13 | 3 | -4/+5 |
| * | | | | | | | | Displays time remaining relative to now | Phil Hughes | 2016-06-13 | 2 | -2/+9 |
| * | | | | | | | | Save database after erasing artifacts | Kamil Trzcinski | 2016-06-13 | 1 | -0/+1 |
| * | | | | | | | | Test ExpireBuildArtifactsWorker | Kamil Trzcinski | 2016-06-13 | 2 | -1/+56 |
| * | | | | | | | | Added keep artifacts API endpoint | Kamil Trzcinski | 2016-06-13 | 3 | -0/+96 |
| * | | | | | | | | Test controllers if they allow to keep artifacts | Kamil Trzcinski | 2016-06-13 | 3 | -1/+109 |
| * | | | | | | | | Allow to show the time in the future | Kamil Trzcinski | 2016-06-13 | 3 | -5/+9 |
| * | | | | | | | | Show the artifacts expiration prompt in Build Artifacts widget | Kamil Trzcinski | 2016-06-13 | 2 | -19/+20 |
| * | | | | | | | | Remove keep_artifacts from BuildsController | Kamil Trzcinski | 2016-06-13 | 1 | -6/+0 |
| * | | | | | | | | Validate existence of artifacts in ArtifactsController, render 404 if not found | Kamil Trzcinski | 2016-06-13 | 1 | -6/+5 |
| * | | | | | | | | Support expiration date in CI API when uploading artifacts | Kamil Trzcinski | 2016-06-13 | 3 | -1/+38 |
| * | | | | | | | | Validate artifacts:expire_in in yaml processor | Kamil Trzcinski | 2016-06-13 | 2 | -2/+32 |
| * | | | | | | | | Add artifacts_expire_in method for Ci::Build | Kamil Trzcinski | 2016-06-13 | 1 | -0/+12 |
| * | | | | | | | | Enable exceptions on ChronicDuration | Kamil Trzcinski | 2016-06-13 | 1 | -0/+1 |
| * | | | | | | | | Added description of artifacts:when | Kamil Trzcinski | 2016-06-13 | 1 | -0/+27 |
| * | | | | | | | | Move keep to ArtifactsController | Kamil Trzcinski | 2016-06-13 | 7 | -20/+27 |
| * | | | | | | | | Allow to expire build artifacts | Kamil Trzcinski | 2016-06-13 | 12 | -3/+65 |
| * | | | | | | | | Added when to artifacts | Kamil Trzcinski | 2016-06-13 | 3 | -0/+48 |
* | | | | | | | | | Merge branch 'update-ci-api-docs' into 'master' | Achilleas Pipinellis | 2016-06-14 | 8 | -222/+250 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Fix grammar and syntax | Achilleas Pipinellis | 2016-06-14 | 1 | -6/+8 |
| * | | | | | | | | Update CI API docs | Achilleas Pipinellis | 2016-06-14 | 8 | -222/+248 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'zj-rework-migration-award-emoji' into 'master' | Yorick Peterse | 2016-06-14 | 2 | -9/+30 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fixed locking syntax for PostgreSQL | Yorick Peterse | 2016-06-14 | 1 | -1/+1 |
| * | | | | | | | Move LOCK TABLES to a separate execute | Yorick Peterse | 2016-06-14 | 1 | -5/+2 |