summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add support for root path for `StringPath`Grzegorz Bizon2016-01-142-9/+41
* Add implementation of remaining methods in `StringPath`Grzegorz Bizon2016-01-142-12/+57
* Improve `StringPath` specs (DRY)Grzegorz Bizon2016-01-141-10/+19
* Add `parent` iteration implementation to `StringPath`Grzegorz Bizon2016-01-142-3/+19
* Use `Gitlab::StringPath` in CI build artifacts controllerGrzegorz Bizon2016-01-142-1/+20
* Add new methods to StringPathGrzegorz Bizon2016-01-142-3/+49
* Add implementation of StringPath classGrzegorz Bizon2016-01-142-0/+56
* Move artifacts controller level upGrzegorz Bizon2016-01-143-9/+5
* Add view action to artifacts controllerGrzegorz Bizon2016-01-144-3/+10
* Move build artifacts implementation to separate controllerGrzegorz Bizon2016-01-144-29/+46
* Improve CI builds seederGrzegorz Bizon2016-01-141-22/+59
* Add database seed for build artifactsGrzegorz Bizon2016-01-141-7/+18
* Add CI build artifacts tarball as a spec fixtureGrzegorz Bizon2016-01-141-0/+0
* Add `artifacts_metadata` field to `Ci::Build`Grzegorz Bizon2016-01-141-0/+2
* Improve CI builds fixturesGrzegorz Bizon2016-01-141-8/+21
* Add initial fixtures for CI buildsGrzegorz Bizon2016-01-141-0/+12
* Add artifacts metadata field to `ci_builds`Grzegorz Bizon2016-01-141-0/+5
* 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
* | 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
| * | | | | Broadcast Messages can now be editedRobert Speicher2016-01-135-28/+49
| * | | | | Update Broadcast Message featuresRobert Speicher2016-01-132-14/+34
| * | | | | Update BroadcastMessage modelRobert Speicher2016-01-133-6/+117
| * | | | | Update broadcast_message helperRobert Speicher2016-01-134-26/+45
| * | | | | Simplify BroadcastMessage factoryRobert Speicher2016-01-133-11/+11
| * | | | | Simplify broadcast message JSRobert Speicher2016-01-131-3/+4
| * | | | | Remove alert_type attribute from BroadcastMessageRobert Speicher2016-01-135-7/+12