summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Show a notice for diffs that are too largehide-large-diffsYorick Peterse2016-03-181-9/+13
* 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-181-18/+0
|\ \
| * | 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-186-8/+90
|\ \ \
| * | | 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
* | | | 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 '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 '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-104-5/+11
| * | | | | | | Single if statementPhil Hughes2016-03-101-5/+3
| * | | | | | | Fixed ruby issues from feedbackPhil Hughes2016-03-104-15/+10
| * | | | | | | 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-173-63/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | Hide builds from Project's settings when the feature is disabledhide-builds-featureKamil Trzcinski2016-03-153-63/+75
* | | | | | | | | Merge branch 'caching-project-avatars' into 'master' Robert Speicher2016-03-173-8/+35
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Cache project avatars stored in GitYorick Peterse2016-03-173-8/+35
| | |/ / / / / / | |/| | | | | |
* | | | | | | | 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-171-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | adjusted behavior so canceled builds tagged as allowed to fail do not fail buildGeoffrey Lalonde2016-03-171-1/+1
* | | | | | | Merge branch 'patch/refactor-post-receive' into 'master' Douwe Maan2016-03-171-27/+19
|\ \ \ \ \ \ \
| * | | | | | | Back-porting PostReceive refactor made for EE 🍺Gabriel Mazetto2016-03-171-27/+19
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-179-42/+66
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-1580-693/+759
| |\ \ \ \ \ \ \