summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix Rubocop CyclomaticComplexity offensebackport-cyclomatic_complexity-fixRémy Coutable2017-04-261-18/+26
* Merge branch 'backport-md-cache-fix' into 'master' Dmitriy Zaporozhets2017-04-261-1/+3
|\
| * Swap a before_save call with a before_create/before_update pair to avoid a co...Nick Thomas2017-04-251-1/+3
* | Merge branch '26509-show-update-time' into 'master' Annabel Dunstone Gray2017-04-263-16/+21
|\ \
| * | Add updated time to project listJeff Stubler2017-04-213-16/+21
* | | Merge branch '22826-ui-inconsistency-different-files-views-find-file-button-m...Clement Ho2017-04-263-10/+5
|\ \ \
| * | | [#22826] Ensure find_file_link and download button is part of file tree headerTM Lee2017-04-233-10/+5
* | | | Merge branch '12910-personal-snippet-prep-2' into 'master' Sean McGivern2017-04-265-29/+37
|\ \ \ \
| * | | | Support preview_markdown action for personal_snippetsJarka Kadlecova2017-04-265-29/+37
* | | | | Load a project's CI status in batch from redisBob Van Landuyt2017-04-263-0/+8
* | | | | Merge branch 'more-mr-filters' into 'master' Sean McGivern2017-04-261-1/+1
|\ \ \ \ \
| * | | | | Ability to filter merge requests by labels and milestonesRobert Schilling2017-04-251-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'group-assignee-dropdown-send-group-id' into 'master' Filipa Lacerda2017-04-262-1/+2
|\ \ \ \ \
| * | | | | Assignee filter on group issues/merge requests only loads group usersgroup-assignee-dropdown-send-group-idPhil Hughes2017-04-242-1/+2
* | | | | | Merge branch '20378-natural-sort-issue-numbers' into 'master'Sean McGivern2017-04-261-4/+5
|\ \ \ \ \ \
| * | | | | | Change issues sentence to use natural sortingJeff Stubler2017-04-251-4/+5
* | | | | | | Fix logic in Users::CreateService broken by the fix for OAuth usersRémy Coutable2017-04-261-8/+15
* | | | | | | Ensures that OAuth/LDAP/SAML users don't need to be confirmedRémy Coutable2017-04-261-4/+4
* | | | | | | Update MR diff blob_fork_suggestion after jQuery updateupdate-mr-diff-blob-fork-suggestion-after-jquery-udpateEric Eastwood2017-04-251-1/+2
* | | | | | | Metrics graph error fixJose Ivan Vargas Lopez2017-04-251-29/+34
* | | | | | | Merge branch 'mr-diff-size-overflow' into 'master' Douwe Maan2017-04-252-9/+10
|\ \ \ \ \ \ \
| * | | | | | | Show correct size when MR diff overflowsSean McGivern2017-04-252-9/+10
* | | | | | | | Resolve "Clean up padding with Markdown headers"Taurie Davis2017-04-2511-38/+44
* | | | | | | | Add sub-nav for Project Integration Services edit pageKushal Pandya2017-04-253-2/+3
* | | | | | | | Merge branch 'dm-fix-oauth-user-creation' into 'master' Robert Speicher2017-04-252-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creationDouwe Maan2017-04-242-4/+4
* | | | | | | | Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master' Douwe Maan2017-04-255-12/+26
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needsEric Eastwood2017-04-245-12/+26
* | | | | | | | Merge branch 'fix-usage-ping-doc-link' into 'master' Rémy Coutable2017-04-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix usage ping docs link from empty cohorts pagefix-usage-ping-doc-linkSean McGivern2017-04-251-1/+1
* | | | | | | | | Show group name on flash container when group is created from Admin areaKushal Pandya2017-04-251-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'use-jquery-on-blob-fork-suggestion' into 'master' Jacob Schatz2017-04-242-29/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Use jQuery niceness on blob_fork_suggestionuse-jquery-on-blob-fork-suggestionEric Eastwood2017-04-222-29/+27
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'add-aria-to-icon' into 'master' Jacob Schatz2017-04-241-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Add testsClement Ho2017-04-181-1/+1
| * | | | | | | | Add aria to iconClement Ho2017-04-121-0/+5
* | | | | | | | | Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' Sean McGivern2017-04-242-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure replying to an individual note by email creates a note with its own di...dm-fix-individual-notes-reply-attributesDouwe Maan2017-04-242-1/+9
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch '31269-task-scroll' into 'master' Jacob Schatz2017-04-241-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add normal wrapping to task lists31269-task-scrollAnnabel Dunstone Gray2017-04-211-0/+4
* | | | | | | | | | Merge branch 'notebooklab-in-repo' into 'master' Jacob Schatz2017-04-2411-2/+478
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into notebooklab-in-reponotebooklab-in-repoPhil Hughes2017-04-1345-1910/+1895
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Pulled in latest changesPhil Hughes2017-04-131-14/+59
| * | | | | | | | | | | Pulled in latest changes from NotebookLabPhil Hughes2017-04-131-0/+4
| * | | | | | | | | | | Merge branch 'master' into notebooklab-in-repoPhil Hughes2017-04-1350-225/+345
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Moved NotebookLab assets into repoPhil Hughes2017-04-1111-2/+429
* | | | | | | | | | | | | Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' Sean McGivern2017-04-242-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-urlStan Hu2017-04-242-5/+9
| * | | | | | | | | | | | | Eliminate N+1 queries in loading namespaces for every issuable in milestonesStan Hu2017-04-231-1/+1
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'diff-discussion-buttons-spacing' into 'master' Annabel Dunstone Gray2017-04-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \