summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Add artifacts metadata uploader filedGrzegorz Bizon2016-01-142-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Artifacts metadata field will be used to store a filename of gzipped file containing metadata definition for given artifacts archive.
| * | | | | | | | | | Make some conditions in `Ci::Build` more readableGrzegorz Bizon2016-01-141-4/+6
| | | | | | | | | | |
| * | | | | | | | | | Update artifacts download specsGrzegorz Bizon2016-01-141-8/+8
| | | | | | | | | | |
| * | | | | | | | | | Add method that checks if artifacts browser is supportedGrzegorz Bizon2016-01-142-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed because of backward compatibility. Previously artifacts archive had `.tar.gz` format, but artifacts browser requires ZIP format now.
| * | | | | | | | | | Update specs for CI Build, add `artifacts?` methodGrzegorz Bizon2016-01-145-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `artifacts?` method checks if artifacts archive is available.
| * | | | | | | | | | Rename method that returns url to CI build artifacts downloadGrzegorz Bizon2016-01-145-8/+12
| | | | | | | | | | |
| * | | | | | | | | | Mix `url_helpers` into `Ci::Build`Grzegorz Bizon2016-01-141-10/+6
| | | | | | | | | | |
| * | | | | | | | | | Add button to CI build artifacts browser into build summaryGrzegorz Bizon2016-01-142-1/+13
| | | | | | | | | | |
| * | | | | | | | | | Remove artifacts metadata column from databaseGrzegorz Bizon2016-01-143-6/+8
| | | | | | | | | | |
| * | | | | | | | | | Add support for parent directories in `StringPath`Grzegorz Bizon2016-01-142-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This support is not completed though, as parent directory that is first in collection returned by `directories!` is not iterable yet.
| * | | | | | | | | | Improve CI build artifacts browser viewGrzegorz Bizon2016-01-143-3/+21
| | | | | | | | | | |
| * | | | | | | | | | Add artifacts browserGrzegorz Bizon2016-01-144-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implementation makes it possible to browse artifacts, it depends on artifacts metadata.
| * | | | | | | | | | Use `Gitlab::StringPath` in CI build artifacts controllerGrzegorz Bizon2016-01-141-1/+8
| | | | | | | | | | |
| * | | | | | | | | | Move artifacts controller level upGrzegorz Bizon2016-01-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts nesting artifacts controller in builds module.
| * | | | | | | | | | Add view action to artifacts controllerGrzegorz Bizon2016-01-143-2/+8
| | | | | | | | | | |
| * | | | | | | | | | Move build artifacts implementation to separate controllerGrzegorz Bizon2016-01-143-28/+37
| | | | | | | | | | |
| * | | | | | | | | | Add `artifacts_metadata` field to `Ci::Build`Grzegorz Bizon2016-01-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will contain serialized array of files inside artifacts tarball.
* | | | | | | | | | | Merge branch 'ci/api-variables' into 'master' Douwe Maan2016-01-141-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add variables API References #4264 See merge request !2264
| * | | | | | | | | | Merge branch 'master' into ci/api-variablesDouwe Maan2016-01-1424-106/+224
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-13229-889/+1394
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 8-4-stable: (285 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Version 8.4.0.rc1 Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR ...
| * | | | | | | | | | Change :variable_id to :key as resource ID in APITomasz Maczukin2016-01-071-1/+5
| | | | | | | | | | |
| * | | | | | | | | | Add features for list and show details of variables in APITomasz Maczukin2015-12-311-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/titles-weight' into 'master' Douwe Maan2016-01-1411-9/+23
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages See #3956. Following is before/after for each page: ## Group title ### Before ![group-title-before](/uploads/d6c013c69f526d553555ff974c29b349/group-title-before.png) ### After ![group-title-after](/uploads/56e0bd176d12943297b5b95d20beb437/group-title-after.png) --- ## Commit title ### Before ![commit-title-before](/uploads/a9bda5212eea843ab4c92acbcf411cdd/commit-title-before.png) ### After ![commit-title-after](/uploads/e3a532460a1e7b0b2a8eb8a6af12abea/commit-title-after.png) --- ## Branch name ### Before ![branch-name-before](/uploads/9d77e39f07cd7b757d02a39f5bc57570/branch-name-before.png) ### After ![branch-name-after](/uploads/6831e9560d196d8a4da209166f224a0f/branch-name-after.png) --- ## Tags name in list ### Before ![tags-name-in-list-before](/uploads/cf0141713af751132fd29220621ea9ab/tags-name-in-list-before.png) ### After ![tags-name-in-list-after](/uploads/902c5b029dc832216ac536d2ad372b83/tags-name-in-list-after.png) --- ## Tag name ### Before ![tags-name-before](/uploads/495acb6b4bab8464a0ffeb8f703435b6/tags-name-before.png) ### After ![tags-name-after](/uploads/f86868dbad57b8226611bcb03e5a9524/tags-name-after.png) --- ## Issue title in list ### Before ![issue-title-in-list-before](/uploads/5f01450aceefdcc2f51984832a4ce6b5/issue-title-in-list-before.png) ### After ![issue-title-in-list-after](/uploads/3144fb231874d23b6b46e108da24b128/issue-title-in-list-after.png) --- ## MR title in list ### Before ![mr-title-in-list-before](/uploads/bd0239104ebf4a5090c724c3851df57c/mr-title-in-list-before.png) ### After ![mr-title-in-list-after](/uploads/16be5460dffc33ff173a6b8ff3250206/mr-title-in-list-after.png) See merge request !2422
| * | | | | | | | | | Improve the consistency of commit titles, branch names, tag names, issue/MR ↵fix/titles-weightRémy Coutable2016-01-1411-9/+23
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | titles, on their respective project pages
* | | | | | | | | | Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-147-12/+60
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users: ![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png) There will be another MR for the EE version. See merge request !2242
| * | | | | | | | | | fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecasesGabriel Mazetto2016-01-141-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix Admin/Users view to position buttons without spacing magicGabriel Mazetto2016-01-142-15/+18
| | | | | | | | | | |
| * | | | | | | | | | Codestyle changesGabriel Mazetto2016-01-121-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Code style fixes and some code simplifiedGabriel Mazetto2016-01-082-10/+12
| | | | | | | | | | |
| * | | | | | | | | | Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-084-0/+22
| | | | | | | | | | |
| * | | | | | | | | | Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-083-2/+12
| | | | | | | | | | |
| * | | | | | | | | | Add ldap_blocked as new state to users state machineGabriel Mazetto2016-01-081-1/+11
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-safe-import-url' into 'master' Douwe Maan2016-01-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the undefinded variable error in Project's safe_import_url method Fixes #7982 See merge request !2419
| * | | | | | | | | | | Fix the undefinded variable error in Project's safe_import_url methodDJ Mountney2016-01-131-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/private-references' into 'master' Douwe Maan2016-01-144-3/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show referenced MRs & Issues only when the current viewer can access them This addresses both issues identified in #6066. ## The private MR by user `remy2` with a note referencing to a public issue ![Screen_Shot_2016-01-12_at_16.45.02](/uploads/c245ec2c1fdea1f9ba05183c24e142d9/Screen_Shot_2016-01-12_at_16.45.02.png) --- ## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** before the fix ![Screen_Shot_2016-01-12_at_18.14.50](/uploads/8db5580e803f5bddd6cb935233c579a0/Screen_Shot_2016-01-12_at_18.14.50.png) --- ## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** with the fix ![Screen_Shot_2016-01-13_at_12.02.32](/uploads/cb199f7b78191fba486a11412412e307/Screen_Shot_2016-01-13_at_12.02.32.png) --- ## The public issue viewed by user `remy2` with the fix (no change) ![Screen_Shot_2016-01-13_at_11.54.06](/uploads/ddece590d69f597a95559beddcd36660/Screen_Shot_2016-01-13_at_11.54.06.png) See merge request !2405
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Rémy Coutable2016-01-1330-56/+115
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | fix/private-references
| * | | | | | | | | | | Move complex view condition to a model methodRémy Coutable2016-01-132-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is moved to a model method rather than an helper method because the API will need it too.
| * | | | | | | | | | | Show referenced MRs & Issues only when the current viewer can access themRémy Coutable2016-01-133-3/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs-broadcasts' into 'master' Douwe Maan2016-01-1410-81/+142
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow broadcast messages to be edited Closes #3046 See merge request !2268
| * | | | | | | | | | | Remove (invalid) timestamp formattingrs-broadcastsRobert Speicher2016-01-131-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Move `BroadcastMessage#status` to a helper since it's presentationalRobert Speicher2016-01-133-11/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Broadcast Messages can now be editedRobert Speicher2016-01-134-27/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3046
| * | | | | | | | | | | Update BroadcastMessage modelRobert Speicher2016-01-131-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds default values for `color` and `font` attributes - Adds `active?`, `started?`, `ended?`, and 'status' methods
| * | | | | | | | | | | Update broadcast_message helperRobert Speicher2016-01-133-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it returns the fully-formatted message so we can be consistent about how it's shown.
| * | | | | | | | | | | Simplify broadcast message JSRobert Speicher2016-01-131-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also resets the default example message when the user input is blank.
| * | | | | | | | | | | Remove alert_type attribute from BroadcastMessageRobert Speicher2016-01-132-5/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Move broadcast message form to a partialRobert Speicher2016-01-133-34/+39
| | | | | | | | | | | |
| * | | | | | | | | | | Style the broadcast message formRobert Speicher2016-01-133-6/+13
| | | | | | | | | | | |
| * | | | | | | | | | | Add js-requires-input to formRobert Speicher2016-01-131-3/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Fix misaligned edit button in milestone collection partialrs-milestone-buttonsRobert Speicher2016-01-131-3/+4
| | | | | | | | | | | |