summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-0/+25
|\
| * #can_unsubscribe? -> #?unsubscribable?Zeger-Jan van de Weg2016-01-111-1/+1
| * Minor improvements, unsubscribe from email footerZeger-Jan van de Weg2016-01-091-2/+2
| * Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-0/+25
* | Improve readability of artifacts browser `Entry` related codeGrzegorz Bizon2016-01-141-5/+5
* | Improvements, readability for artifacts browserGrzegorz Bizon2016-01-141-7/+7
* | Check if file exists in metadata in download actionGrzegorz Bizon2016-01-141-3/+8
* | Render only valid paths in artifacts metadataGrzegorz Bizon2016-01-141-1/+4
* | Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-141-1/+7
* | Add method that checks if path exists in `StringPath`Grzegorz Bizon2016-01-141-1/+1
* | Render 404 when artifacts path is invalidGrzegorz Bizon2016-01-141-0/+1
* | Extract artifacts metadata implementation to separate classGrzegorz Bizon2016-01-141-4/+1
* | Parse artifacts metadata stored in JSON formatGrzegorz Bizon2016-01-141-2/+2
* | Use metadata stored in artifacats metadata fileGrzegorz Bizon2016-01-141-2/+2
* | Add artifacts metadata uploader filedGrzegorz Bizon2016-01-141-1/+1
* | Update specs for CI Build, add `artifacts?` methodGrzegorz Bizon2016-01-141-0/+2
* | Remove artifacts metadata column from databaseGrzegorz Bizon2016-01-141-4/+1
* | Add artifacts browserGrzegorz Bizon2016-01-141-4/+2
* | Use `Gitlab::StringPath` in CI build artifacts controllerGrzegorz Bizon2016-01-141-1/+8
* | Move artifacts controller level upGrzegorz Bizon2016-01-141-2/+2
* | Add view action to artifacts controllerGrzegorz Bizon2016-01-141-0/+4
* | Move build artifacts implementation to separate controllerGrzegorz Bizon2016-01-142-27/+36
* | Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-142-1/+5
|\ \
| * | Code style fixes and some code simplifiedGabriel Mazetto2016-01-081-2/+2
| * | Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-081-0/+2
| * | Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-081-1/+3
| |/
* | Merge branch 'fix/private-references' into 'master' Douwe Maan2016-01-141-1/+1
|\ \
| * \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/pri...Rémy Coutable2016-01-132-4/+3
| |\ \
| * | | Show referenced MRs & Issues only when the current viewer can access themRémy Coutable2016-01-131-1/+1
* | | | Broadcast Messages can now be editedRobert Speicher2016-01-131-5/+17
* | | | Remove alert_type attribute from BroadcastMessageRobert Speicher2016-01-131-4/+7
| |/ / |/| |
* | | Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-131-0/+1
|\ \ \
| * | | Make the metrics sampler interval configurableYorick Peterse2016-01-131-0/+1
| |/ /
* | | Block the reported user before destroying the recordrs-block-user-before-removalRobert Speicher2016-01-121-4/+2
|/ /
* | Merge branch 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-111-2/+4
|\ \
| * | Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-111-2/+4
* | | Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-111-1/+1
|\ \ \ | |/ / |/| |
| * | Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-071-1/+1
* | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-081-2/+8
|\ \ \ | | |/ | |/|
| * | Add support for ref and path to commits filteringDmitriy Zaporozhets2016-01-071-1/+1
| * | Filter commits by search parameterDmitriy Zaporozhets2016-01-071-2/+8
| |/
* | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-074-3/+29
|\ \ | |/
| * Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-072-0/+28
| * Merge branch 'remove-influxdb-credentials' into 'master' Yorick Peterse2016-01-071-2/+0
| |\
| | * Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-061-2/+0
| * | Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-061-0/+5
| |\ \ | | |/
| * | Get "Merge when build succeeds" to work when commits were pushed to MR target...Douwe Maan2016-01-051-1/+1
* | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-0679-870/+1139
|\ \ \ | | |/ | |/|
| * | Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-051-0/+5
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-0333-241/+366
| | |\
View Lorry Controller Status