summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into diff-parse-first-commitdiff-parse-first-commitDouwe Maan2016-01-1420-10/+463
|\
| * Merge branch 'ci/api-variables' into 'master' Douwe Maan2016-01-149-1/+439
| |\
| | * Fix versionDouwe Maan2016-01-141-1/+1
| | * Merge branch 'master' into ci/api-variablesDouwe Maan2016-01-1454-230/+931
| | |\
| | * | Update CHANGELOG [ci skip]ci/api-variablesTomasz Maczukin2016-01-131-0/+1
| | * | Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-13431-2651/+4847
| | |\ \
| | | * \ Merge branch 'master' into 8-4-stableRobert Speicher2016-01-1323-307/+596
| | | |\ \
| | | * | | Version 8.4.0.rc1v8.4.0.rc1Marin Jankovski2016-01-131-1/+1
| | * | | | Add some cosmetic changes to variables API documentation [ci skip]Tomasz Maczukin2016-01-131-44/+22
| | * | | | Modify builds API documentation style [ci skip]Tomasz Maczukin2016-01-131-20/+64
| | * | | | Modify :ci_variable factoryTomasz Maczukin2016-01-132-7/+4
| | * | | | Add 'Build' prefix to Variables entry name in API docs indexTomasz Maczukin2016-01-132-2/+2
| | * | | | Fix some typosTomasz Maczukin2016-01-131-2/+2
| | * | | | Add some fixes after reviewTomasz Maczukin2016-01-131-13/+16
| | * | | | Remove blank lineTomasz Maczukin2016-01-121-1/+0
| | * | | | Update ./doc/apiTomasz Maczukin2016-01-073-1/+108
| | * | | | Change :variable_id to :key as resource ID in APITomasz Maczukin2016-01-073-53/+36
| | * | | | Fix a typo in method descriptionTomasz Maczukin2015-12-311-1/+1
| | * | | | Add create feature to variables APITomasz Maczukin2015-12-313-1/+59
| | * | | | Add missing 'not_found' checks in variables APITomasz Maczukin2015-12-312-0/+25
| | * | | | Add delete feature to variables APITomasz Maczukin2015-12-312-1/+40
| | * | | | Add update feature for variables APITomasz Maczukin2015-12-312-9/+64
| | * | | | Add features for list and show details of variables in APITomasz Maczukin2015-12-316-0/+150
| * | | | | Merge branch 'fix/titles-weight' into 'master' Douwe Maan2016-01-1412-9/+24
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Improve the consistency of commit titles, branch names, tag names, issue/MR t...fix/titles-weightRémy Coutable2016-01-1412-9/+24
| | | |_|/ | | |/| |
* | | | | Properly generate diff of orphan commits, like the first commit in a repositoryDouwe Maan2016-01-142-2/+4
|/ / / /
* | | | Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-1417-73/+249
|\ \ \ \
| * | | | fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecasesGabriel Mazetto2016-01-143-6/+4
| * | | | Fix Admin/Users view to position buttons without spacing magicGabriel Mazetto2016-01-142-15/+18
| * | | | Codestyle changesGabriel Mazetto2016-01-123-6/+6
| * | | | Code style fixes and some code simplifiedGabriel Mazetto2016-01-084-12/+16
| * | | | Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-087-0/+109
| * | | | LDAP synchronization block/unblock new statesGabriel Mazetto2016-01-082-23/+17
| * | | | Prevent ldap_blocked users from being blocked/unblocked by the APIGabriel Mazetto2016-01-083-11/+30
| * | | | Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-084-11/+38
| * | | | Add ldap_blocked as new state to users state machineGabriel Mazetto2016-01-082-17/+39
* | | | | 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 methodDJ Mountney2016-01-131-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'fix/private-references' into 'master' Douwe Maan2016-01-1415-17/+352
|\ \ \ \ \
| * | | | | Fix specs and rubocop warningsfix/private-referencesRémy Coutable2016-01-143-8/+9
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/pri...Rémy Coutable2016-01-1366-433/+942
| |\ \ \ \ \
| * | | | | | Ensure the API doesn't return notes that the current user shouldn't seeRémy Coutable2016-01-132-2/+70
| * | | | | | Add spec for Note#cross_reference_not_visible_for?Rémy Coutable2016-01-131-0/+24
| * | | | | | Improve & adds specs for Issue/MR referencesRémy Coutable2016-01-137-135/+218
| * | | | | | Move complex view condition to a model methodRémy Coutable2016-01-132-1/+8
| * | | | | | Show referenced MRs & Issues only when the current viewer can access themRémy Coutable2016-01-138-3/+155
* | | | | | | Merge branch 'rs-broadcasts' into 'master' Douwe Maan2016-01-1419-126/+315
|\ \ \ \ \ \ \
| * | | | | | | Remove (invalid) timestamp formattingrs-broadcastsRobert Speicher2016-01-131-2/+2
| * | | | | | | Move `BroadcastMessage#status` to a helper since it's presentationalRobert Speicher2016-01-135-31/+31
| * | | | | | | Update CHANGELOGRobert Speicher2016-01-131-0/+1
View Lorry Controller Status