summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Cache the rendered README, but post-process on showToon Claes2017-04-275-22/+42
* Move some methods from ApplicationHelper to MarkupHelperToon Claes2017-04-272-32/+32
* Rename GitlabMarkdownHelper -> MarkupHelperToon Claes2017-04-272-2/+2
* Merge branch 'add-username-to-activity-feed' into 'master' Rémy Coutable2017-04-272-1/+2
|\
| * Add username to activity atom feed (!10802)winniehell2017-04-262-1/+2
* | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'Sean McGivern2017-04-272-1/+20
|\ \
| * | Fix rendering emoji inside a stringblackst0ne2017-04-252-1/+20
* | | Merge branch '30645-show-pipeline-events-description' into 'master' Kamil Trzciński2017-04-271-2/+2
|\ \ \
| * | | Remove description for build_events, add pipeline_events30645-show-pipeline-events-descriptionLin Jen-Shin2017-04-251-2/+2
* | | | Fix typo found in issue board sidebar milestone dropdown31475-issue-boards-sidebar-milestone-dropdown-title-has-a-typoClement Ho2017-04-261-1/+1
| |_|/ |/| |
* | | Merge branch 'backport-cyclomatic_complexity-fix' into 'master' Douwe Maan2017-04-261-18/+26
|\ \ \
| * | | Fix Rubocop CyclomaticComplexity offensebackport-cyclomatic_complexity-fixRémy Coutable2017-04-261-18/+26
* | | | Add button to delete filters from filtered search barClement Ho2017-04-263-14/+60
* | | | Resolve "Jobs dropdown in mini graph should close when we receive an error"Filipa Lacerda2017-04-263-18/+39
* | | | Merge branch 'replace_header_mr_icon' into 'master' Filipa Lacerda2017-04-261-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Replace header merge request iconblackst0ne2017-04-261-1/+2
| |/ /
* | | 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