summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Stop testing Ruby 2.1. We now have gems that require >= 2.2.0:sh-stop-testing-ruby-2.1Stan Hu2016-09-161-52/+0
* Merge branch 'fix-anchor-icon' into 'master' Jacob Schatz2016-09-161-1/+1
|\
| * fix anchor icon regression introduced in 2fd6472 (!5577)fix-anchor-iconMike Greiling2016-09-151-1/+1
* | Merge branch 'fix-reduce-contributions-calendar-payload' into 'master' Jacob Schatz2016-09-166-13/+52
|\ \
| * | Replace contributions calendar timezone payload with datesClement Ho2016-09-166-13/+52
|/ /
* | Merge branch 'feature/use-oj-gem' into 'master' Yorick Peterse2016-09-163-0/+6
|\ \
| * | Use oj gem for faster JSON processingAhmad Sherif2016-09-163-0/+6
|/ /
* | Merge branch 'bump-fog-aws' into 'master' Rémy Coutable2016-09-162-4/+5
|\ \
| * | Bump fog-aws and other dependent modulesStan Hu2016-09-162-4/+5
* | | Merge branch '22256-nomethoderror-api-entities-note-missing-attribute-note-on...Rémy Coutable2016-09-163-5/+18
|\ \ \ | |/ / |/| |
| * | Fix API notes endpoint when posting only emojiZ.J. van de Weg2016-09-163-5/+18
* | | Merge branch '22246-actionview-template-error-undefined-method-each-for-nil-n...Stan Hu2016-09-162-7/+15
|\ \ \
| * | | MergeRequest#environments now returns an empty array when diff_head_commit is...22246-actionview-template-error-undefined-method-each-for-nil-nilclassRémy Coutable2016-09-162-7/+15
* | | | Merge branch 'issue-22083' into 'master' Rémy Coutable2016-09-162-1/+2
|\ \ \ \
| * | | | fixed incorrect reference to @repository.root_ref in _readme.html.haml. #22083Jason Aquino2016-09-162-1/+2
| | |/ / | |/| |
* | | | Merge branch 'group_approvers' into 'master' Rémy Coutable2016-09-1630-569/+1
|\ \ \ \
| * | | | Remove schema annotations completelyValery Sizov2016-09-1630-569/+1
* | | | | Add missing CHANGELOG entryRémy Coutable2016-09-161-0/+1
| |/ / / |/| | |
* | | | Merge branch 'increase_artifact_size_column' into 'master' Yorick Peterse2016-09-163-2/+18
|\ \ \ \
| * | | | Increase ci_builds artifacts_size column to 8-byte integer to allow larger filesDrew Blessing2016-09-153-2/+18
| | |/ / | |/| |
* | | | Merge branch 'integer_migration_style' into 'master' Yorick Peterse2016-09-163-43/+88
|\ \ \ \
| * | | | fixDrew Blessing2016-09-151-8/+3
| * | | | Add support for column limits in add_column_with_defaultDrew Blessing2016-09-153-44/+94
| |/ / /
* | | | Merge branch 'sh-add-link-to-reliable-capybara-specs' into 'master' Achilleas Pipinellis2016-09-161-0/+2
|\ \ \ \
| * | | | Add link to article on how to write reliable, asynchronous tests with Capybarash-add-link-to-reliable-capybara-specsStan Hu2016-09-121-0/+2
* | | | | Merge branch 'diff-comments-toggle-tooltip-hide' into 'master' Fatih Acet2016-09-162-0/+2
|\ \ \ \ \
| * | | | | Hides tooltip on discussion toggle button when clickingdiff-comments-toggle-tooltip-hidePhil Hughes2016-09-122-0/+2
* | | | | | Merge branch 'issue-boards-large-height-load' into 'master' Fatih Acet2016-09-162-0/+6
|\ \ \ \ \ \
| * | | | | | Fixed issue boards loading issues on large screensissue-boards-large-height-loadPhil Hughes2016-09-132-0/+6
* | | | | | | Merge branch 'issue_21824' into 'master' Fatih Acet2016-09-163-9/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix issuable templates dropdown for forked projectsissue_21824Felipe Artur2016-09-153-9/+14
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'group-specific-lfs-settings' into 'master' Rémy Coutable2016-09-1621-19/+288
|\ \ \ \ \ \ \
| * | | | | | | Syntax fixes and better tests for helper methods. Updated docs.group-specific-lfs-settingsPatricio Cano2016-09-1511-26/+137
| * | | | | | | Correct helper for group LFS status.Patricio Cano2016-09-151-14/+14
| * | | | | | | Improved helper methods, better flow for `project.lfs_enabled?`, and UI fixes.Patricio Cano2016-09-157-37/+33
| * | | | | | | Added CHANGELOG itemPatricio Cano2016-09-151-0/+2
| * | | | | | | Added group-specific setting for LFS.Patricio Cano2016-09-1519-12/+172
* | | | | | | | Merge branch 'rs-update-rubocop-rspec' into 'master' Rémy Coutable2016-09-163-14/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | Update `.rubocop.yml` for rubocop-rspec 1.7.0rs-update-rubocop-rspecRobert Speicher2016-09-151-10/+67
| * | | | | | | | Bump rubocop-rspec to 1.7.0Robert Speicher2016-09-152-4/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'fix-typos' into 'master' Rémy Coutable2016-09-162-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix spelling: sucessfully -> successfullyStan Hu2016-09-152-2/+2
* | | | | | | | | Merge branch '20870-secret-variables-sorted-by-key' into 'master' Rémy Coutable2016-09-162-3/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Sort secret variables by key (fix #20870)Diego Souza2016-09-092-3/+5
* | | | | | | | | | Merge branch 'fix/irreversible-migration' into 'master' Rémy Coutable2016-09-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix undefined method when reverting migration RemoveProjectsPushesSinceGcfix/irreversible-migrationDouglas Barbosa Alexandre2016-09-151-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'ci-stages' into 'master' Fatih Acet2016-09-163-15/+30
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Change percentage to pxAnnabel Dunstone Gray2016-09-161-1/+1
| * | | | | | | | Update stages to match sketch fileci-stagesAnnabel Dunstone Gray2016-09-161-5/+7
| * | | | | | | | Remove empty stage state; fit tooltip on one lineAnnabel Dunstone Gray2016-09-164-26/+7
View Lorry Controller Status