Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'improve-award-emoji-spinach-tests' into 'master' | Robert Speicher | 2016-03-18 | 2 | -4/+11 |
|\ | |||||
| * | Improve award emoji test reliability by checking that the emoji is displayed | Stan Hu | 2016-03-17 | 2 | -4/+11 |
* | | Merge branch 'issue_14374' into 'master' | Robert Speicher | 2016-03-18 | 1 | -3/+4 |
|\ \ | |/ |/| | |||||
| * | Check push permissions only when pushing directly to target branch.issue_14374 | Rubén Dávila | 2016-03-17 | 1 | -3/+4 |
* | | Merge branch 'fix_dropdown_getting_cut_off_in_page' into 'master' | Jacob Schatz | 2016-03-17 | 1 | -0/+7 |
|\ \ | |||||
| * | | fix bug causing dropdown to get cut off in project pagefix_dropdown_getting_cut_off_in_page | Arinde Eniola | 2016-03-16 | 1 | -0/+7 |
* | | | Merge branch 'fix_issue_mr_page_inconsistency' into 'master' | Jacob Schatz | 2016-03-17 | 2 | -13/+15 |
|\ \ \ | |||||
| * | | | Fix inconsistency in the header of issue and merge request pages | Arinde Eniola | 2016-03-17 | 2 | -13/+15 |
* | | | | Merge branch 'download-dropdown-alignment' into 'master' | Jacob Schatz | 2016-03-17 | 2 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | Fixed alignment of download dropdowndownload-dropdown-alignment | Phil Hughes | 2016-03-16 | 2 | -1/+7 |
* | | | | | Merge branch 'filter-spacing' into 'master' | Jacob Schatz | 2016-03-17 | 1 | -14/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed filter spacingfilter-spacing | Phil Hughes | 2016-03-17 | 1 | -14/+3 |
* | | | | | | Merge branch 'git-2-7-4' into 'master' | Robert Speicher | 2016-03-17 | 3 | -6/+9 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into git-2-7-4 | Douwe Maan | 2016-03-17 | 25 | -156/+452 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'edited-text' into 'master' | Robert Speicher | 2016-03-17 | 6 | -18/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Added skip_js commentedited-text | Phil Hughes | 2016-03-16 | 1 | -0/+1 |
| * | | | | | | | Fixed failing rubocop test | Phil Hughes | 2016-03-10 | 1 | -5/+5 |
| * | | | | | | | Fixed issue with timeago not firing | Phil Hughes | 2016-03-10 | 5 | -7/+24 |
| * | | | | | | | Single if statement | Phil Hughes | 2016-03-10 | 1 | -5/+3 |
| * | | | | | | | Fixed ruby issues from feedback | Phil Hughes | 2016-03-10 | 5 | -28/+12 |
| * | | | | | | | Edited timeago text on comments | Phil Hughes | 2016-03-10 | 6 | -24/+35 |
* | | | | | | | | Merge branch 'blue-links-fix' into 'master' | Jacob Schatz | 2016-03-17 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert link color from blueblue-links-fix | Alfredo Sumaran | 2016-03-17 | 1 | -4/+0 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'hide-builds-feature' into 'master' | Robert Speicher | 2016-03-17 | 4 | -63/+76 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Hide builds from Project's settings when the feature is disabledhide-builds-feature | Kamil Trzcinski | 2016-03-15 | 4 | -63/+76 |
* | | | | | | | | | Merge branch 'caching-project-avatars' into 'master' | Robert Speicher | 2016-03-17 | 5 | -13/+120 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Cache project avatars stored in Git | Yorick Peterse | 2016-03-17 | 5 | -13/+120 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'artem-forks/gitlab-ce-nginx-rel-url' | Jacob Vosmaer | 2016-03-17 | 10 | -58/+227 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Lets have CSS and logo inline | Artem Sidorenko | 2016-03-11 | 8 | -56/+208 |
| * | | | | | | | | Do not serve anything via nginx as we have workhorse | Artem Sidorenko | 2016-03-11 | 2 | -2/+19 |
| | | | | * | | | | Bump Git version requirement to 2.7.4 | Douwe Maan | 2016-03-17 | 3 | -6/+9 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'dropdown-preselect-value' into 'master' | Robert Speicher | 2016-03-17 | 2 | -4/+21 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Moved code to single line if | Phil Hughes | 2016-03-17 | 1 | -4/+2 |
| * | | | | | | | Removed label/milestone helper methodsdropdown-preselect-value | Phil Hughes | 2016-03-16 | 2 | -20/+10 |
| * | | | | | | | Fixed failing tests | Phil Hughes | 2016-03-16 | 1 | -1/+2 |
| * | | | | | | | Pre-selects values on issue and merge request dropdown | Phil Hughes | 2016-03-16 | 2 | -4/+32 |
* | | | | | | | | Merge branch 'glalonde-triggerbuild' into 'master' | Kamil Trzciński | 2016-03-17 | 3 | -1/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | added changelog entry | Geoffrey Lalonde | 2016-03-17 | 1 | -0/+1 |
| * | | | | | | | | adjusted behavior so canceled builds tagged as allowed to fail do not fail build | Geoffrey Lalonde | 2016-03-17 | 2 | -1/+24 |
* | | | | | | | | | Merge branch 'rm_duplicate_cache_ci_docs' into 'master' | Achilleas Pipinellis | 2016-03-17 | 1 | -62/+48 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into rm_duplicate_cache_ci_docs | Achilleas Pipinellis | 2016-03-17 | 212 | -4709/+2860 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge duplicate cache entry in CI docsrm_duplicate_cache_ci_docs | Achilleas Pipinellis | 2016-03-14 | 1 | -60/+48 |
* | | | | | | | | | | Merge branch 'patch/refactor-post-receive' into 'master' | Douwe Maan | 2016-03-17 | 2 | -27/+79 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Back-porting PostReceive refactor made for EE 🍺 | Gabriel Mazetto | 2016-03-17 | 2 | -27/+79 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '4009-external-users' into 'master' | Douwe Maan | 2016-03-17 | 23 | -80/+265 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add missing API docs on external user | Achilleas Pipinellis | 2016-03-17 | 2 | -2/+3 |
| * | | | | | | | | | | API support for setting External flag on existing users | Zeger-Jan van de Weg | 2016-03-17 | 2 | -1/+9 |
| * | | | | | | | | | | Refactor external users docs | Achilleas Pipinellis | 2016-03-17 | 1 | -14/+18 |
| * | | | | | | | | | | Merge branch 'master' into 4009-external-users4009-external-users | Zeger-Jan van de Weg | 2016-03-15 | 134 | -4265/+2169 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Doc external users feature | Zeger-Jan van de Weg | 2016-03-15 | 4 | -2/+21 |