summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* buttons updateproject-button-fixAndriy Dyadyura2016-01-144-4/+4
* modified: app/views/projects/buttons/_fork.html.hamlAndriy Dyadyura2016-01-145-270/+270
* 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
| * | | 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
* | | | Merge branch 'rs-milestone-buttons' into 'master' Dmitriy Zaporozhets2016-01-142-9/+10
|\ \ \ \
| * | | | Fix misaligned edit button in milestone collection partialrs-milestone-buttonsRobert Speicher2016-01-131-3/+4
| * | | | Update button styles for Milestones#showRobert Speicher2016-01-131-6/+6
* | | | | Merge branch 'update-go-1.5.3' into 'master' Achilleas Pipinellis2016-01-141-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update to Go 1.5.3Stan Hu2016-01-131-4/+4
|/ / / /
* | | | Add Changelog entry for build traces data integrity fixGrzegorz Bizon2016-01-131-0/+1
| |_|/ |/| |
* | | Merge branch 'doc_styleguide' into 'master' Achilleas Pipinellis2016-01-134-26/+236
|\ \ \
| * | | Update doc_styleguide.md [ci skip]Achilleas Pipinellis2016-01-131-24/+28
| * | | Clarify the naming guidelinedoc_styleguideAchilleas Pipinellis2016-01-121-1/+4
| * | | Add new location of doc_styleguide in CONTRIBUTING.mdAchilleas Pipinellis2016-01-121-2/+2
| * | | Move doc_styleguide in the development directoryAchilleas Pipinellis2016-01-123-24/+227
* | | | Merge branch 'user-search-hint' into 'master' Drew Blessing2016-01-132-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Added hint that you can search users by name, username, or email.Patricio Cano2016-01-132-2/+2
|/ / /
* | | Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-137-259/+318
|\ \ \
| * | | Randomize metrics sample intervalsconfigure-randomize-metrics-sample-intervalYorick Peterse2016-01-132-4/+46
| * | | Make the metrics sampler interval configurableYorick Peterse2016-01-136-255/+272
* | | | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' Douwe Maan2016-01-136-10/+11
|\ \ \ \
| * | | | Add changelogJason Lee2016-01-131-0/+1
| * | | | Use CGI.escape instead of URI.escape, because URI is obsoleted.Jason Lee2016-01-124-8/+8
| * | | | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some compl...Jason Lee2016-01-121-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'ci/api-projects' into 'master' Douwe Maan2016-01-133-9/+26
|\ \ \ \
| * | | | Modify CI features in projects APIci/api-projectsTomasz Maczukin2016-01-114-51/+17
| * | | | Update ./doc/apiTomasz Maczukin2016-01-072-3/+42
| * | | | Add ci fields in project create/update feature APITomasz Maczukin2016-01-052-4/+13
| * | | | Add CI data to projcet entityTomasz Maczukin2016-01-051-0/+3
* | | | | Merge branch 'maintain-milestone-filter' into 'master' Douwe Maan2016-01-132-1/+2
|\ \ \ \ \