summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Show a notice for diffs that are too largehide-large-diffsYorick Peterse2016-03-185-13/+35
* Merge branch 'improve-diff-ui' into 'master' Jacob Schatz2016-03-181-1/+9
|\
| * Add space to separate different files in diffimprove-diff-uiDmitriy Zaporozhets2016-03-171-1/+9
* | Merge branch 'project-cache-worker-without-diverging' into 'master' Jacob Vosmaer2016-03-182-18/+30
|\ \
| * | Added tests for Repository#build_cacheproject-cache-worker-without-divergingYorick Peterse2016-03-171-0/+30
| * | Don't rebuild diverging commit count cachesYorick Peterse2016-03-171-6/+0
| * | Removed Repository#rebuild_cacheYorick Peterse2016-03-171-12/+0
* | | Merge branch 'optimistic-todos' into 'master' Jacob Schatz2016-03-187-9/+90
|\ \ \
| * | | Fixed failing testsoptimistic-todosPhil Hughes2016-03-171-1/+0
| * | | Mark all as done through AJAXPhil Hughes2016-03-174-8/+35
| * | | Removed the flash success messagePhil Hughes2016-03-175-41/+35
| * | | Remove `Flash` from todos when finishedJacob Schatz2016-03-171-1/+0
| * | | Adds small AJAX optimistic functionality to todos.Jacob Schatz2016-03-176-5/+67
* | | | Merge branch 'fix-any-milestone-value' into 'master' Jacob Schatz2016-03-181-1/+2
|\ \ \ \
| * | | | Changed any variable name to save confusionPhil Hughes2016-03-181-2/+2
| * | | | Removed comparing against textPhil Hughes2016-03-181-1/+2
| * | | | Fixes issue with any milestone value in dropdown not being selectablePhil Hughes2016-03-181-1/+1
|/ / / /
* | | | Merge branch 'fix-group-members-ui' into 'master' Dmitriy Zaporozhets2016-03-181-0/+4
|\ \ \ \
| * | | | Add side padding to content-list if inside panelfix-group-members-uiDmitriy Zaporozhets2016-03-171-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'fix-issue-14338' into 'master' Achilleas Pipinellis2016-03-185-5/+5
|\ \ \ \
| * | | | Use relative links in `doc`, fix broken generated HTML linksAnatoly Borodin2016-03-175-5/+5
* | | | | Merge branch 'ci-duplication' into 'master' Achilleas Pipinellis2016-03-181-36/+1
|\ \ \ \ \
| * | | | | 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
| | |/ / / / / / / / | |/| | | | | | | |