Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatusci/api-builds | Tomasz Maczukin | 2016-01-14 | 3 | -5/+3 |
* | Merge branch 'master' into ci/api-builds | Tomasz Maczukin | 2016-01-14 | 73 | -240/+1394 |
|\ | |||||
| * | Merge branch 'ci/api-variables' into 'master' | Douwe Maan | 2016-01-14 | 9 | -1/+439 |
| |\ | |||||
| | * | Fix version | Douwe Maan | 2016-01-14 | 1 | -1/+1 |
| | * | Merge branch 'master' into ci/api-variables | Douwe Maan | 2016-01-14 | 54 | -230/+931 |
| | |\ | |||||
| | * | | Update CHANGELOG [ci skip]ci/api-variables | Tomasz Maczukin | 2016-01-13 | 1 | -0/+1 |
| | * | | Merge branch '8-4-stable' into ci/api-variables | Tomasz Maczukin | 2016-01-13 | 431 | -2651/+4847 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' into 8-4-stable | Robert Speicher | 2016-01-13 | 23 | -307/+596 |
| | | |\ \ | |||||
| | | * | | | Version 8.4.0.rc1v8.4.0.rc1 | Marin Jankovski | 2016-01-13 | 1 | -1/+1 |
| | * | | | | Add some cosmetic changes to variables API documentation [ci skip] | Tomasz Maczukin | 2016-01-13 | 1 | -44/+22 |
| | * | | | | Modify builds API documentation style [ci skip] | Tomasz Maczukin | 2016-01-13 | 1 | -20/+64 |
| | * | | | | Modify :ci_variable factory | Tomasz Maczukin | 2016-01-13 | 2 | -7/+4 |
| | * | | | | Add 'Build' prefix to Variables entry name in API docs index | Tomasz Maczukin | 2016-01-13 | 2 | -2/+2 |
| | * | | | | Fix some typos | Tomasz Maczukin | 2016-01-13 | 1 | -2/+2 |
| | * | | | | Add some fixes after review | Tomasz Maczukin | 2016-01-13 | 1 | -13/+16 |
| | * | | | | Remove blank line | Tomasz Maczukin | 2016-01-12 | 1 | -1/+0 |
| | * | | | | Update ./doc/api | Tomasz Maczukin | 2016-01-07 | 3 | -1/+108 |
| | * | | | | Change :variable_id to :key as resource ID in API | Tomasz Maczukin | 2016-01-07 | 3 | -53/+36 |
| | * | | | | Fix a typo in method description | Tomasz Maczukin | 2015-12-31 | 1 | -1/+1 |
| | * | | | | Add create feature to variables API | Tomasz Maczukin | 2015-12-31 | 3 | -1/+59 |
| | * | | | | Add missing 'not_found' checks in variables API | Tomasz Maczukin | 2015-12-31 | 2 | -0/+25 |
| | * | | | | Add delete feature to variables API | Tomasz Maczukin | 2015-12-31 | 2 | -1/+40 |
| | * | | | | Add update feature for variables API | Tomasz Maczukin | 2015-12-31 | 2 | -9/+64 |
| | * | | | | Add features for list and show details of variables in API | Tomasz Maczukin | 2015-12-31 | 6 | -0/+150 |
| * | | | | | Merge branch 'fix/titles-weight' into 'master' | Douwe Maan | 2016-01-14 | 12 | -9/+24 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Improve the consistency of commit titles, branch names, tag names, issue/MR t...fix/titles-weight | Rémy Coutable | 2016-01-14 | 12 | -9/+24 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'feature/ldap-sync-edgecases' into 'master' | Douwe Maan | 2016-01-14 | 17 | -73/+249 |
| |\ \ \ \ | |||||
| | * | | | | fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecases | Gabriel Mazetto | 2016-01-14 | 3 | -6/+4 |
| | * | | | | Fix Admin/Users view to position buttons without spacing magic | Gabriel Mazetto | 2016-01-14 | 2 | -15/+18 |
| | * | | | | Codestyle changes | Gabriel Mazetto | 2016-01-12 | 3 | -6/+6 |
| | * | | | | Code style fixes and some code simplified | Gabriel Mazetto | 2016-01-08 | 4 | -12/+16 |
| | * | | | | Repair ldap_blocked state when no ldap identity exist anymore | Gabriel Mazetto | 2016-01-08 | 7 | -0/+109 |
| | * | | | | LDAP synchronization block/unblock new states | Gabriel Mazetto | 2016-01-08 | 2 | -23/+17 |
| | * | | | | Prevent ldap_blocked users from being blocked/unblocked by the API | Gabriel Mazetto | 2016-01-08 | 3 | -11/+30 |
| | * | | | | Prevent ldap_blocked users from being unblocked by the Admin UI | Gabriel Mazetto | 2016-01-08 | 4 | -11/+38 |
| | * | | | | Add ldap_blocked as new state to users state machine | Gabriel Mazetto | 2016-01-08 | 2 | -17/+39 |
| * | | | | | Merge branch 'fix-safe-import-url' into 'master' | Douwe Maan | 2016-01-14 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix the undefinded variable error in Project's safe_import_url method | DJ Mountney | 2016-01-13 | 1 | -1/+1 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch 'fix/private-references' into 'master' | Douwe Maan | 2016-01-14 | 15 | -17/+352 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix specs and rubocop warningsfix/private-references | Rémy Coutable | 2016-01-14 | 3 | -8/+9 |
| | * | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/pri... | Rémy Coutable | 2016-01-13 | 66 | -433/+942 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Ensure the API doesn't return notes that the current user shouldn't see | Rémy Coutable | 2016-01-13 | 2 | -2/+70 |
| | * | | | | | | Add spec for Note#cross_reference_not_visible_for? | Rémy Coutable | 2016-01-13 | 1 | -0/+24 |
| | * | | | | | | Improve & adds specs for Issue/MR references | Rémy Coutable | 2016-01-13 | 7 | -135/+218 |
| | * | | | | | | Move complex view condition to a model method | Rémy Coutable | 2016-01-13 | 2 | -1/+8 |
| | * | | | | | | Show referenced MRs & Issues only when the current viewer can access them | Rémy Coutable | 2016-01-13 | 8 | -3/+155 |
| * | | | | | | | Merge branch 'rs-broadcasts' into 'master' | Douwe Maan | 2016-01-14 | 19 | -126/+315 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Remove (invalid) timestamp formattingrs-broadcasts | Robert Speicher | 2016-01-13 | 1 | -2/+2 |
| | * | | | | | | | Move `BroadcastMessage#status` to a helper since it's presentational | Robert Speicher | 2016-01-13 | 5 | -31/+31 |
| | * | | | | | | | Update CHANGELOG | Robert Speicher | 2016-01-13 | 1 | -0/+1 |