summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Loop all disks when displaying system infoissue-18886Josh Frye2016-06-292-5/+27
* Change load average to cpu/cores on system info.Josh Frye2016-06-282-3/+4
* Use number_to_human_size for system info and remove dependency on Filesize gem.Josh Frye2016-06-283-7/+7
* Round figures for system infoJosh Frye2016-06-282-6/+6
* Ensure Monitoring tab is highlightedJosh Frye2016-06-281-1/+1
* Fix stylingJosh Frye2016-06-282-5/+5
* Show basic system info on admin panel. Closes #18886Josh Frye2016-06-283-0/+38
* Fix group visibility UI consistency in settingsGrzegorz Bizon2016-06-281-1/+1
* Merge branch '18942-dropdowns-should-apply-any-present-filter-once-data-is-lo...Jacob Schatz2016-06-281-0/+2
|\
| * forced filter input to process inputs after data has loaded18942-dropdowns-should-apply-any-present-filter-once-data-is-loadedLuke "Jared" Bennett2016-06-221-0/+2
* | Merge branch 'lbennett/gitlab-ce-2542-implement-updated-ui-for-new-project-pa...Jacob Schatz2016-06-283-105/+178
|\ \
| * | Wiped old page and started on new UIlbennett/gitlab-ce-2542-implement-updated-ui-for-new-project-pageLuke "Jared" Bennett2016-06-283-105/+178
* | | Switched mobile button icons to ellipsis and angleAnnabel Dunstone2016-06-288-15/+13
* | | Decreased window min width for pinned sidebarAnnabel Dunstone2016-06-282-2/+2
* | | Merge branch 'display-deleted-ref-in-events' into 'master' Rémy Coutable2016-06-282-9/+18
|\ \ \
| * | | Display last commit of deleted branch in push events (!4699)winniehell2016-06-282-9/+18
* | | | Merge branch 'fix/attr-encrypted-issue' into 'master' Rémy Coutable2016-06-283-0/+3
|\ \ \ \
| * | | | add missing attribute to attr_encrypted so it is fully backwards-compatibleJames Lopez2016-06-283-0/+3
| | |/ / | |/| |
* | | | Merge branch 'feature/custom-highlighting' into 'master' Rémy Coutable2016-06-285-6/+18
|\ \ \ \ | |/ / / |/| | |
| * | | move the path alias to a more appropriate locationhttp://jneen.net/2016-06-271-5/+5
| * | | add an alias for Snippet#pathhttp://jneen.net/2016-06-271-0/+6
| * | | add custom highlighting via .gitattributeshttp://jneen.net/2016-06-274-6/+12
* | | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-06-275-7/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'fix-18997' into 'master' Robert Speicher2016-06-271-1/+10
| |\ \ \
| | * | | Fix visibility of private project snippets for members when searchingDouglas Barbosa Alexandre2016-06-221-4/+10
| | * | | Fix internal snippets can be searched by anyoneDouglas Barbosa Alexandre2016-06-221-1/+4
| * | | | Merge branch '19102-fix' into 'master' Robert Speicher2016-06-274-6/+7
| |\ \ \ \
| | * | | | Fix an information disclosure when requesting access to a group containing pr...Rémy Coutable2016-06-244-6/+7
| | | |/ / | | |/| |
* | | | | Merge branch 'issue_18398' into 'master' Douwe Maan2016-06-271-0/+11
|\ \ \ \ \
| * | | | | Check for conflict with wiki projects when creating a new project.issue_18398Ruben Davila2016-06-271-0/+11
* | | | | | Merge branch 'cherry-pick-5734e266' into 'master' Robert Speicher2016-06-271-1/+8
|\ \ \ \ \ \
| * | | | | | Fix rendering of commit notesDouwe Maan2016-06-271-1/+8
* | | | | | | Merge branch 'emoji-menu-stick-search' into 'master' Jacob Schatz2016-06-273-14/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Made the search bar on emoji menu stickyPhil Hughes2016-06-203-14/+15
* | | | | | | Merge branch 'mark-done-todo-id' into 'master' Robert Speicher2016-06-271-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Correctly returns todo ID after creating todomark-done-todo-idPhil Hughes2016-06-271-1/+2
* | | | | | | | Merge branch '19075-new-wiki' into 'master' Fatih Acet2016-06-271-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Add conditional for new pag linkAnnabel Dunstone2016-06-271-0/+4
| * | | | | | | | Remove duplicate new page btn from edit wikiAnnabel Dunstone2016-06-271-3/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'new-branch-check-fix' into 'master' Fatih Acet2016-06-271-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix check for existence of new branch button (!4630)winniehell2016-06-271-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'revert-sri' into 'master' Jacob Schatz2016-06-272-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert Subresource Integrity pending a fix for Firefox's incorrect hashing im...revert-sriConnor Shea2016-06-272-4/+4
* | | | | | | Merge branch 'image-sizing' into 'master' Rémy Coutable2016-06-273-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Wrap images in divs with Banzai and limit max-height.image-sizingConnor Shea2016-06-273-0/+3
| |/ / / / / /
* | | | | | | Merge branch 'case-insensitive-ci-skip' into 'master' Rémy Coutable2016-06-271-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add support for "skip ci" tooSimon Welsh2016-06-251-1/+1
| * | | | | | Allow "ci skip" to be in any caseSimon Welsh2016-06-251-1/+1
| | |/ / / / | |/| | | |
* | | | | | Clean up some unused templates imported from GitLab CITakuya Noguchi2016-06-266-65/+0
* | | | | | Merge branch 'issue_19096' into 'master' Stan Hu2016-06-251-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |