summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove CI duplication.ci-duplicationSytse Sijbrandij2016-03-171-36/+1
* Merge branch 'improve-award-emoji-spinach-tests' into 'master' Robert Speicher2016-03-182-4/+11
|\
| * Improve award emoji test reliability by checking that the emoji is displayedStan Hu2016-03-172-4/+11
* | Merge branch 'issue_14374' into 'master' Robert Speicher2016-03-181-3/+4
|\ \ | |/ |/|
| * Check push permissions only when pushing directly to target branch.issue_14374Rubén Dávila2016-03-171-3/+4
* | Merge branch 'fix_dropdown_getting_cut_off_in_page' into 'master' Jacob Schatz2016-03-171-0/+7
|\ \
| * | fix bug causing dropdown to get cut off in project pagefix_dropdown_getting_cut_off_in_pageArinde Eniola2016-03-161-0/+7
* | | Merge branch 'fix_issue_mr_page_inconsistency' into 'master' Jacob Schatz2016-03-172-13/+15
|\ \ \
| * | | Fix inconsistency in the header of issue and merge request pagesArinde Eniola2016-03-172-13/+15
* | | | Merge branch 'download-dropdown-alignment' into 'master' Jacob Schatz2016-03-172-1/+7
|\ \ \ \
| * | | | Fixed alignment of download dropdowndownload-dropdown-alignmentPhil Hughes2016-03-162-1/+7
* | | | | Merge branch 'filter-spacing' into 'master' Jacob Schatz2016-03-171-14/+3
|\ \ \ \ \
| * | | | | Fixed filter spacingfilter-spacingPhil Hughes2016-03-171-14/+3
* | | | | | Merge branch 'git-2-7-4' into 'master' Robert Speicher2016-03-173-6/+9
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into git-2-7-4Douwe Maan2016-03-1725-156/+452
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'edited-text' into 'master' Robert Speicher2016-03-176-18/+29
|\ \ \ \ \ \ \
| * | | | | | | Added skip_js commentedited-textPhil Hughes2016-03-161-0/+1
| * | | | | | | Fixed failing rubocop testPhil Hughes2016-03-101-5/+5
| * | | | | | | Fixed issue with timeago not firingPhil Hughes2016-03-105-7/+24
| * | | | | | | Single if statementPhil Hughes2016-03-101-5/+3
| * | | | | | | Fixed ruby issues from feedbackPhil Hughes2016-03-105-28/+12
| * | | | | | | Edited timeago text on commentsPhil Hughes2016-03-106-24/+35
* | | | | | | | Merge branch 'blue-links-fix' into 'master' Jacob Schatz2016-03-171-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert link color from blueblue-links-fixAlfredo Sumaran2016-03-171-4/+0
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'hide-builds-feature' into 'master' Robert Speicher2016-03-174-63/+76
|\ \ \ \ \ \ \ \
| * | | | | | | | Hide builds from Project's settings when the feature is disabledhide-builds-featureKamil Trzcinski2016-03-154-63/+76
* | | | | | | | | Merge branch 'caching-project-avatars' into 'master' Robert Speicher2016-03-175-13/+120
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cache project avatars stored in GitYorick Peterse2016-03-175-13/+120
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'artem-forks/gitlab-ce-nginx-rel-url'Jacob Vosmaer2016-03-1710-58/+227
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Lets have CSS and logo inlineArtem Sidorenko2016-03-118-56/+208
| * | | | | | | | Do not serve anything via nginx as we have workhorseArtem Sidorenko2016-03-112-2/+19
| | | | | * | | | Bump Git version requirement to 2.7.4Douwe Maan2016-03-173-6/+9
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'dropdown-preselect-value' into 'master' Robert Speicher2016-03-172-4/+21
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Moved code to single line ifPhil Hughes2016-03-171-4/+2
| * | | | | | | Removed label/milestone helper methodsdropdown-preselect-valuePhil Hughes2016-03-162-20/+10
| * | | | | | | Fixed failing testsPhil Hughes2016-03-161-1/+2
| * | | | | | | Pre-selects values on issue and merge request dropdownPhil Hughes2016-03-162-4/+32
* | | | | | | | Merge branch 'glalonde-triggerbuild' into 'master' Kamil Trzciński2016-03-173-1/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | added changelog entryGeoffrey Lalonde2016-03-171-0/+1
| * | | | | | | | adjusted behavior so canceled builds tagged as allowed to fail do not fail buildGeoffrey Lalonde2016-03-172-1/+24
* | | | | | | | | Merge branch 'rm_duplicate_cache_ci_docs' into 'master' Achilleas Pipinellis2016-03-171-62/+48
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into rm_duplicate_cache_ci_docsAchilleas Pipinellis2016-03-17212-4709/+2860
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge duplicate cache entry in CI docsrm_duplicate_cache_ci_docsAchilleas Pipinellis2016-03-141-60/+48
* | | | | | | | | | Merge branch 'patch/refactor-post-receive' into 'master' Douwe Maan2016-03-172-27/+79
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Back-porting PostReceive refactor made for EE 🍺Gabriel Mazetto2016-03-172-27/+79
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-1723-80/+265
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add missing API docs on external userAchilleas Pipinellis2016-03-172-2/+3
| * | | | | | | | | | API support for setting External flag on existing usersZeger-Jan van de Weg2016-03-172-1/+9
| * | | | | | | | | | Refactor external users docsAchilleas Pipinellis2016-03-171-14/+18
| * | | | | | | | | | Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-15134-4265/+2169
| |\ \ \ \ \ \ \ \ \ \