summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed markdown buttons in FFff-markdown-buttons-fixPhil Hughes2016-07-051-2/+3
* Merge branch '19496-fix-build' into 'master' Stan Hu2016-07-051-2/+1
|\
| * Assert against `ActionMailer::Base.deliveries` relatively.Timothy Andrew2016-07-051-2/+1
|/
* Merge branch 'diagnosing-mail-issues' into 'master' Achilleas Pipinellis2016-07-041-2/+51
|\
| * Add troubleshooting section for SMTP settingsStan Hu2016-07-011-2/+51
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-07-047-9/+65
|\ \
| * \ Merge branch 'master' into dev-masterTomasz Maczukin2016-07-02396-3101/+7106
| |\ \
| * \ \ Merge branch '18033-private-repo-mentions' into 'master' Douwe Maan2016-06-304-2/+42
| |\ \ \
| | * | | Ensure logged-out users can't see private refsSean McGivern2016-06-304-2/+42
| * | | | Merge branch '19312-confidential-issue' into 'master' Douwe Maan2016-06-303-7/+24
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixed privilege escalation issue where manually set external users would be r...Patricio Cano2016-06-293-7/+24
* | | | | Merge branch 'user-avatar-header' into 'master' Dmitriy Zaporozhets2016-07-046-20/+42
|\ \ \ \ \
| * | | | | Updating padding in dropdown menuuser-avatar-headerPhil Hughes2016-06-291-4/+4
| * | | | | Fixed logout testsPhil Hughes2016-06-284-6/+9
| * | | | | Added user avatar to headerPhil Hughes2016-06-273-11/+30
* | | | | | Merge branch 'more_descriptive_git_shell_messages' into 'master' Dmitriy Zaporozhets2016-07-044-3/+22
|\ \ \ \ \ \
| * | | | | | Handle custom Git hook result in GitLab UIValery Sizov2016-07-044-3/+22
* | | | | | | Merge branch 'fix-dead-links' into 'master' Achilleas Pipinellis2016-07-044-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix dead links in the docsTakuya Noguchi2016-06-264-6/+6
* | | | | | | | Merge branch 'upgrade-rspec-rails' into 'master' Robert Speicher2016-07-042-21/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Upgrade rspec-rails from 3.4.2 to 3.5.0.upgrade-rspec-railsConnor Shea2016-07-012-21/+21
* | | | | | | | | Merge branch 'patch-1' into 'master' Hannes Rosenögger2016-07-041-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add note on changing password of SSH keyCaesar Schinas2016-05-251-3/+6
| * | | | | | | | | Update README.md - SSH password can be changed with `ssh-keygen -p`Caesar Schinas2016-05-141-2/+1
* | | | | | | | | | Merge branch 'save-artifacts_sizes' into 'master' Rémy Coutable2016-07-046-21/+69
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Use describe rather than context for this:save-artifacts_sizesLin Jen-Shin2016-07-041-1/+1
| * | | | | | | | | Explicitly set to nil when artifacts don't exist:Lin Jen-Shin2016-07-041-0/+2
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into save-artifacts_sizesLin Jen-Shin2016-07-04704-3380/+8041
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add a new column `artifacts_size` to table `ci_builds` !4964Lin Jen-Shin2016-07-041-0/+1
| * | | | | | | | | | Use describe rather than context, feedback from:Lin Jen-Shin2016-07-041-1/+1
| * | | | | | | | | | Rename to "successful artifacts upload", feedback:Lin Jen-Shin2016-07-041-4/+4
| * | | | | | | | | | Rename shared_examples, feedback:Lin Jen-Shin2016-07-011-4/+4
| * | | | | | | | | | Remove migration guide comment:Lin Jen-Shin2016-07-011-3/+0
| * | | | | | | | | | Use nil for non-existing files rather than 0Lin Jen-Shin2016-07-012-2/+4
| * | | | | | | | | | Use AR callbacks as suggested by:Lin Jen-Shin2016-06-293-4/+11
| * | | | | | | | | | Also remove ci_builds.artifacts_size when erasedLin Jen-Shin2016-06-282-0/+2
| * | | | | | | | | | Prefer Ci::Build#erase_artifacts!Lin Jen-Shin2016-06-281-2/+1
| * | | | | | | | | | Just save the size in total rather than individual filesLin Jen-Shin2016-06-285-36/+14
| * | | | | | | | | | Introduce ci_builds.artifacts_sizes as JSON:Lin Jen-Shin2016-06-284-3/+44
| * | | | | | | | | | Cleanup the tests a bit in order to extend itLin Jen-Shin2016-06-281-15/+34
* | | | | | | | | | | Merge branch 'update-spring-to-1.7.2' into 'master' Rémy Coutable2016-07-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update spring to 1.7.2 to fix hanging rails consoleupdate-spring-to-1.7.2Kamil Trzcinski2016-07-041-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'git_hooks_better_message' into 'master' Dmitriy Zaporozhets2016-07-049-28/+36
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Better message for git hooks and file locksValery Sizov2016-07-049-28/+36
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '13524-keep-around-commits' into 'master' Douwe Maan2016-07-0412-7/+88
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Document Repository#keep_aroundDouwe Maan2016-07-041-4/+8
| * | | | | | | | | | Don't garbage collect commits that have related DB records like commentsDouwe Maan2016-07-0412-7/+84
* | | | | | | | | | | Merge branch 'downgrade-redis-3-2-2' into 'master' Robert Speicher2016-07-032-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiqdowngrade-redis-3-2-2Stan Hu2016-07-012-1/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'redcloth-4-3-2-cve-2012-6684' into 'master' Stan Hu2016-07-033-3/+4
|\ \ \ \ \ \ \ \ \ \ \