Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'smarter-diverging-commit-cache-flushing' into 'master' | Douwe Maan | 2016-02-09 | 2 | -13/+17 |
|\ | |||||
| * | Smarter flushing of branch statistics caches | Yorick Peterse | 2016-02-09 | 2 | -13/+17 |
* | | Merge remote-tracking branch 'dev/master' into 'master' | Robert Speicher | 2016-02-09 | 18 | -114/+93 |
|\ \ | |||||
| * \ | Merge branch 'ci-permissions' into 'master' | Robert Speicher | 2016-02-08 | 18 | -114/+93 |
| |\ \ | |||||
| | * | | Remove current_user && when can? is used | Kamil Trzcinski | 2016-02-05 | 2 | -2/+2 |
| | * | | Merge branch 'master' into ci-permissions | Kamil Trzcinski | 2016-02-05 | 65 | -338/+736 |
| | |\ \ | |||||
| | * | | | Use `delete` instead of assignment operator when filtering build abilities | Kamil Trzcinski | 2016-02-04 | 1 | -1/+1 |
| | * | | | Update ability model after comments | Kamil Trzcinski | 2016-02-04 | 1 | -24/+15 |
| | * | | | Merge remote-tracking branch 'origin/master' into ci-permissions | Kamil Trzcinski | 2016-02-04 | 62 | -316/+521 |
| | |\ \ \ | |||||
| | * | | | | Rename allow_guest_to_access_builds to public_builds | Kamil Trzcinski | 2016-02-04 | 3 | -10/+10 |
| | * | | | | Simplify abilities | Kamil Trzcinski | 2016-02-04 | 1 | -16/+23 |
| | * | | | | Properly handle commit status permissions (for a build) | Kamil Trzcinski | 2016-02-03 | 2 | -4/+26 |
| | * | | | | Fix build errors | Kamil Trzcinski | 2016-02-03 | 2 | -4/+8 |
| | * | | | | Clean Ci::ApplicationController from unused permission related code | Kamil Trzcinski | 2016-02-03 | 2 | -50/+2 |
| | * | | | | Add CI setting: allow_guest_to_access_builds | Kamil Trzcinski | 2016-02-02 | 3 | -8/+15 |
| | * | | | | Make the CI permission model simpler | Kamil Trzcinski | 2016-02-02 | 15 | -52/+48 |
* | | | | | | Merge branch 'fix/max-attachment-size-setting-validation' | Douwe Maan | 2016-02-09 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Validate maximum attachment size in application settings | Grzegorz Bizon | 2016-02-09 | 1 | -0/+4 |
* | | | | | | | Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mai... | Douwe Maan | 2016-02-09 | 6 | -0/+21 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail | Jason Lee | 2016-02-09 | 6 | -0/+21 |
* | | | | | | | Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project' | Douwe Maan | 2016-02-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Validate uniqueness of milestone title per project | Zeger-Jan van de Weg | 2016-02-08 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'add-tooltip-to-stuck-builds' into 'master' | Douwe Maan | 2016-02-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Add a tooltip to the stuck warning build symbol | Jeroen van Baarsen | 2016-02-08 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs-broadcast-markdown' into 'master' | Douwe Maan | 2016-02-09 | 7 | -16/+47 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdown | Robert Speicher | 2016-02-06 | 7 | -16/+47 |
* | | | | | | Merge branch 'increase_import_timeout' into 'master' | Douwe Maan | 2016-02-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Increase project import timeout from 4 minutes to 15 minutes | Drew Blessing | 2016-02-04 | 1 | -1/+1 |
* | | | | | | | Merge branch 'snippet_search_refactoring' | Valery Sizov | 2016-02-09 | 2 | -23/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Faster snippet search | Valery Sizov | 2016-02-05 | 2 | -23/+27 |
* | | | | | | | | Merge branch 'caching-repository-git-operations' into 'master' | Yorick Peterse | 2016-02-09 | 3 | -3/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Cache various Repository Git operationscaching-repository-git-operations | Yorick Peterse | 2016-02-08 | 3 | -3/+25 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master' | Rémy Coutable | 2016-02-08 | 3 | -0/+9 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add a controller test for the new 'diff_view' cookie | Rémy Coutable | 2016-02-05 | 1 | -3/+1 |
| * | | | | | | | Remember user's inline/tabular diff view preference in a cookie | kkm | 2016-02-05 | 3 | -0/+11 |
* | | | | | | | | Merge branch 'project-title-dropdown-toggle-button' into 'master' | Jacob Schatz | 2016-02-05 | 2 | -2/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Uses icon helper for dropdown toggle icon | Phil Hughes | 2016-02-05 | 1 | -1/+1 |
| * | | | | | | | | Changed the project switcher dropdown toggle | Phil Hughes | 2016-02-05 | 2 | -2/+11 |
* | | | | | | | | | Merge branch 'improve-diverging-commit-counts' into 'master' | Robert Speicher | 2016-02-05 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Dedicated method for counting commits between refsimprove-diverging-commit-counts | Yorick Peterse | 2016-02-04 | 1 | -2/+5 |
* | | | | | | | | | Merge branch 'feature/jschatz1/sidebar-features' into 'master' | Dmitriy Zaporozhets | 2016-02-05 | 3 | -4/+23 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Changes sidebar widthfeature/jschatz1/sidebar-features | Jacob Schatz | 2016-02-05 | 1 | -2/+2 |
| * | | | | | | | | | Add `j` and `k` shortcuts | Jacob Schatz | 2016-02-05 | 2 | -2/+21 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'bug/jschatz1/sidebar-issues' into 'master' | Dmitriy Zaporozhets | 2016-02-05 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix diff and commit view on merge requestsbug/jschatz1/sidebar-issues | Jacob Schatz | 2016-02-04 | 1 | -2/+4 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rrott/gitlab-ce-logo-issue-11867' into 'master' | Robert Speicher | 2016-02-05 | 4 | -3/+23 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | fixed issue with poor logo transition animation on safari | Roman Rott | 2016-02-05 | 4 | -3/+23 |
* | | | | | | | | | Improve placeholder: search -> Search | Dmitriy Zaporozhets | 2016-02-05 | 1 | -1/+1 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Add JS style changes.feature/jschatz1/issuable-date-positioning | Jacob Schatz | 2016-02-05 | 1 | -2/+4 |
* | | | | | | | | Edited time ago location change. | Jacob Schatz | 2016-02-05 | 5 | -50/+62 |