Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '19318-pipelines-find-git-calls' into 'master' | Yorick Peterse | 2016-06-29 | 1 | -2/+2 |
|\ | |||||
| * | PipelinesFinder use git cached data19318-pipelines-find-git-calls | Paco Guzman | 2016-06-29 | 1 | -2/+2 |
* | | Merge branch '17295_discussion_note' into 'master' | Jacob Schatz | 2016-06-29 | 1 | -0/+4 |
|\ \ | |||||
| * | | Display user avatar inside of .discussion-body | Alfredo Sumaran | 2016-06-28 | 1 | -0/+4 |
* | | | Merge branch 'md-toolbar-multiline-code' into 'master' | Jacob Schatz | 2016-06-29 | 2 | -12/+37 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Markdown toolbar inserts code blocksmd-toolbar-multiline-code | Phil Hughes | 2016-06-27 | 2 | -12/+37 |
* | | | Merge branch 'new-mr-avatar-alignment' into 'master' | Jacob Schatz | 2016-06-29 | 1 | -1/+8 |
|\ \ \ | |||||
| * | | | Fixed avatar alignment in new MR viewnew-mr-avatar-alignment | Phil Hughes | 2016-06-24 | 1 | -1/+8 |
* | | | | Merge branch 'zj-workhorse-format-patch' into 'master' | Robert Speicher | 2016-06-29 | 2 | -8/+7 |
|\ \ \ \ | |||||
| * | | | | Workhorse to serve email diffs | Z.J. van de Weg | 2016-06-28 | 2 | -8/+7 |
* | | | | | Change load average to cpu/cores on system info. | Josh Frye | 2016-06-28 | 2 | -3/+4 |
* | | | | | Use number_to_human_size for system info and remove dependency on Filesize gem. | Josh Frye | 2016-06-28 | 3 | -7/+7 |
* | | | | | Round figures for system info | Josh Frye | 2016-06-28 | 2 | -6/+6 |
* | | | | | Ensure Monitoring tab is highlighted | Josh Frye | 2016-06-28 | 1 | -1/+1 |
* | | | | | Fix styling | Josh Frye | 2016-06-28 | 2 | -5/+5 |
* | | | | | Show basic system info on admin panel. Closes #18886 | Josh Frye | 2016-06-28 | 3 | -0/+38 |
* | | | | | Fix group visibility UI consistency in settings | Grzegorz Bizon | 2016-06-28 | 1 | -1/+1 |
* | | | | | Merge branch '18942-dropdowns-should-apply-any-present-filter-once-data-is-lo... | Jacob Schatz | 2016-06-28 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | forced filter input to process inputs after data has loaded18942-dropdowns-should-apply-any-present-filter-once-data-is-loaded | Luke "Jared" Bennett | 2016-06-22 | 1 | -0/+2 |
* | | | | | | Merge branch 'lbennett/gitlab-ce-2542-implement-updated-ui-for-new-project-pa... | Jacob Schatz | 2016-06-28 | 3 | -105/+178 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Wiped old page and started on new UIlbennett/gitlab-ce-2542-implement-updated-ui-for-new-project-page | Luke "Jared" Bennett | 2016-06-28 | 3 | -105/+178 |
* | | | | | | Switched mobile button icons to ellipsis and angle | Annabel Dunstone | 2016-06-28 | 8 | -15/+13 |
* | | | | | | Decreased window min width for pinned sidebar | Annabel Dunstone | 2016-06-28 | 2 | -2/+2 |
* | | | | | | Merge branch 'display-deleted-ref-in-events' into 'master' | Rémy Coutable | 2016-06-28 | 2 | -9/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Display last commit of deleted branch in push events (!4699) | winniehell | 2016-06-28 | 2 | -9/+18 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'fix/attr-encrypted-issue' into 'master' | Rémy Coutable | 2016-06-28 | 3 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add missing attribute to attr_encrypted so it is fully backwards-compatible | James Lopez | 2016-06-28 | 3 | -0/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'feature/custom-highlighting' into 'master' | Rémy Coutable | 2016-06-28 | 5 | -6/+18 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | move the path alias to a more appropriate location | http://jneen.net/ | 2016-06-27 | 1 | -5/+5 |
| * | | | | | add an alias for Snippet#path | http://jneen.net/ | 2016-06-27 | 1 | -0/+6 |
| * | | | | | add custom highlighting via .gitattributes | http://jneen.net/ | 2016-06-27 | 4 | -6/+12 |
* | | | | | | Merge remote-tracking branch 'dev/master' | Robert Speicher | 2016-06-27 | 5 | -7/+17 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge branch 'fix-18997' into 'master' | Robert Speicher | 2016-06-27 | 1 | -1/+10 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix visibility of private project snippets for members when searching | Douglas Barbosa Alexandre | 2016-06-22 | 1 | -4/+10 |
| | * | | | | | Fix internal snippets can be searched by anyone | Douglas Barbosa Alexandre | 2016-06-22 | 1 | -1/+4 |
| * | | | | | | Merge branch '19102-fix' into 'master' | Robert Speicher | 2016-06-27 | 4 | -6/+7 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix an information disclosure when requesting access to a group containing pr... | Rémy Coutable | 2016-06-24 | 4 | -6/+7 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge branch 'issue_18398' into 'master' | Douwe Maan | 2016-06-27 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Check for conflict with wiki projects when creating a new project.issue_18398 | Ruben Davila | 2016-06-27 | 1 | -0/+11 |
* | | | | | | | | Merge branch 'cherry-pick-5734e266' into 'master' | Robert Speicher | 2016-06-27 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Fix rendering of commit notes | Douwe Maan | 2016-06-27 | 1 | -1/+8 |
* | | | | | | | | Merge branch 'emoji-menu-stick-search' into 'master' | Jacob Schatz | 2016-06-27 | 3 | -14/+15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Made the search bar on emoji menu sticky | Phil Hughes | 2016-06-20 | 3 | -14/+15 |
* | | | | | | | | Merge branch 'mark-done-todo-id' into 'master' | Robert Speicher | 2016-06-27 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Correctly returns todo ID after creating todomark-done-todo-id | Phil Hughes | 2016-06-27 | 1 | -1/+2 |
* | | | | | | | | | Merge branch '19075-new-wiki' into 'master' | Fatih Acet | 2016-06-27 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add conditional for new pag link | Annabel Dunstone | 2016-06-27 | 1 | -0/+4 |
| * | | | | | | | | | Remove duplicate new page btn from edit wiki | Annabel Dunstone | 2016-06-27 | 1 | -3/+0 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'new-branch-check-fix' into 'master' | Fatih Acet | 2016-06-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix check for existence of new branch button (!4630) | winniehell | 2016-06-27 | 1 | -1/+1 |
| |/ / / / / / / |