Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add index on both Award Emoji user and nameindex-on-emoji-name-and-user | Z.J. van de Weg | 2016-07-05 | 3 | -1/+14 |
* | Merge branch '19496-fix-build' into 'master' | Stan Hu | 2016-07-05 | 1 | -2/+1 |
|\ | |||||
| * | Assert against `ActionMailer::Base.deliveries` relatively. | Timothy Andrew | 2016-07-05 | 1 | -2/+1 |
|/ | |||||
* | Merge branch 'diagnosing-mail-issues' into 'master' | Achilleas Pipinellis | 2016-07-04 | 1 | -2/+51 |
|\ | |||||
| * | Add troubleshooting section for SMTP settings | Stan Hu | 2016-07-01 | 1 | -2/+51 |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2016-07-04 | 7 | -9/+65 |
|\ \ | |||||
| * \ | Merge branch 'master' into dev-master | Tomasz Maczukin | 2016-07-02 | 396 | -3101/+7106 |
| |\ \ | |||||
| * \ \ | Merge branch '18033-private-repo-mentions' into 'master' | Douwe Maan | 2016-06-30 | 4 | -2/+42 |
| |\ \ \ | |||||
| | * | | | Ensure logged-out users can't see private refs | Sean McGivern | 2016-06-30 | 4 | -2/+42 |
| * | | | | Merge branch '19312-confidential-issue' into 'master' | Douwe Maan | 2016-06-30 | 3 | -7/+24 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Fixed privilege escalation issue where manually set external users would be r... | Patricio Cano | 2016-06-29 | 3 | -7/+24 |
* | | | | | Merge branch 'user-avatar-header' into 'master' | Dmitriy Zaporozhets | 2016-07-04 | 6 | -20/+42 |
|\ \ \ \ \ | |||||
| * | | | | | Updating padding in dropdown menuuser-avatar-header | Phil Hughes | 2016-06-29 | 1 | -4/+4 |
| * | | | | | Fixed logout tests | Phil Hughes | 2016-06-28 | 4 | -6/+9 |
| * | | | | | Added user avatar to header | Phil Hughes | 2016-06-27 | 3 | -11/+30 |
* | | | | | | Merge branch 'more_descriptive_git_shell_messages' into 'master' | Dmitriy Zaporozhets | 2016-07-04 | 4 | -3/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Handle custom Git hook result in GitLab UI | Valery Sizov | 2016-07-04 | 4 | -3/+22 |
* | | | | | | | Merge branch 'fix-dead-links' into 'master' | Achilleas Pipinellis | 2016-07-04 | 4 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix dead links in the docs | Takuya Noguchi | 2016-06-26 | 4 | -6/+6 |
* | | | | | | | | Merge branch 'upgrade-rspec-rails' into 'master' | Robert Speicher | 2016-07-04 | 2 | -21/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Upgrade rspec-rails from 3.4.2 to 3.5.0.upgrade-rspec-rails | Connor Shea | 2016-07-01 | 2 | -21/+21 |
* | | | | | | | | | Merge branch 'patch-1' into 'master' | Hannes Rosenögger | 2016-07-04 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add note on changing password of SSH key | Caesar Schinas | 2016-05-25 | 1 | -3/+6 |
| * | | | | | | | | | Update README.md - SSH password can be changed with `ssh-keygen -p` | Caesar Schinas | 2016-05-14 | 1 | -2/+1 |
* | | | | | | | | | | Merge branch 'save-artifacts_sizes' into 'master' | Rémy Coutable | 2016-07-04 | 6 | -21/+69 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Use describe rather than context for this:save-artifacts_sizes | Lin Jen-Shin | 2016-07-04 | 1 | -1/+1 |
| * | | | | | | | | | Explicitly set to nil when artifacts don't exist: | Lin Jen-Shin | 2016-07-04 | 1 | -0/+2 |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into save-artifacts_sizes | Lin Jen-Shin | 2016-07-04 | 704 | -3380/+8041 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add a new column `artifacts_size` to table `ci_builds` !4964 | Lin Jen-Shin | 2016-07-04 | 1 | -0/+1 |
| * | | | | | | | | | | Use describe rather than context, feedback from: | Lin Jen-Shin | 2016-07-04 | 1 | -1/+1 |
| * | | | | | | | | | | Rename to "successful artifacts upload", feedback: | Lin Jen-Shin | 2016-07-04 | 1 | -4/+4 |
| * | | | | | | | | | | Rename shared_examples, feedback: | Lin Jen-Shin | 2016-07-01 | 1 | -4/+4 |
| * | | | | | | | | | | Remove migration guide comment: | Lin Jen-Shin | 2016-07-01 | 1 | -3/+0 |
| * | | | | | | | | | | Use nil for non-existing files rather than 0 | Lin Jen-Shin | 2016-07-01 | 2 | -2/+4 |
| * | | | | | | | | | | Use AR callbacks as suggested by: | Lin Jen-Shin | 2016-06-29 | 3 | -4/+11 |
| * | | | | | | | | | | Also remove ci_builds.artifacts_size when erased | Lin Jen-Shin | 2016-06-28 | 2 | -0/+2 |
| * | | | | | | | | | | Prefer Ci::Build#erase_artifacts! | Lin Jen-Shin | 2016-06-28 | 1 | -2/+1 |
| * | | | | | | | | | | Just save the size in total rather than individual files | Lin Jen-Shin | 2016-06-28 | 5 | -36/+14 |
| * | | | | | | | | | | Introduce ci_builds.artifacts_sizes as JSON: | Lin Jen-Shin | 2016-06-28 | 4 | -3/+44 |
| * | | | | | | | | | | Cleanup the tests a bit in order to extend it | Lin Jen-Shin | 2016-06-28 | 1 | -15/+34 |
* | | | | | | | | | | | Merge branch 'update-spring-to-1.7.2' into 'master' | Rémy Coutable | 2016-07-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Update spring to 1.7.2 to fix hanging rails consoleupdate-spring-to-1.7.2 | Kamil Trzcinski | 2016-07-04 | 1 | -1/+1 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'git_hooks_better_message' into 'master' | Dmitriy Zaporozhets | 2016-07-04 | 9 | -28/+36 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Better message for git hooks and file locks | Valery Sizov | 2016-07-04 | 9 | -28/+36 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '13524-keep-around-commits' into 'master' | Douwe Maan | 2016-07-04 | 12 | -7/+88 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Document Repository#keep_around | Douwe Maan | 2016-07-04 | 1 | -4/+8 |
| * | | | | | | | | | | Don't garbage collect commits that have related DB records like comments | Douwe Maan | 2016-07-04 | 12 | -7/+84 |
* | | | | | | | | | | | Merge branch 'downgrade-redis-3-2-2' into 'master' | Robert Speicher | 2016-07-03 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiqdowngrade-redis-3-2-2 | Stan Hu | 2016-07-01 | 2 | -1/+2 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'redcloth-4-3-2-cve-2012-6684' into 'master' | Stan Hu | 2016-07-03 | 3 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ \ |