summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change order of stubbing to fix testsPatricio Cano2016-07-042-2/+1
* Added tests for 2FA check on OAuth requestPatricio Cano2016-07-044-7/+53
* Add 2FA check to the OAuth authentication mechanismPatricio Cano2016-06-291-0/+1
* Merge branch 'cal-activities-target-reference' into 'master' Fatih Acet2016-06-291-1/+1
|\
| * Changes calendar activities to use target referencecal-activities-target-referencePhil Hughes2016-06-291-1/+1
|/
* Merge branch 'filter-fade-fix' into 'master' Jacob Schatz2016-06-291-2/+1
|\
| * Removed fade when filtering resultsfilter-fade-fixPhil Hughes2016-06-271-2/+1
* | Merge branch '14669-bugzilla-integration' into 'master' Rémy Coutable2016-06-299-4/+97
|\ \
| * | Moved CHANGELOG entry up to help avoid future conflictsTim2016-06-291-1/+1
| * | Removed redudant methods implemented by parent classTim2016-06-292-15/+0
| * | Set field defaults to be the same as IssueTrackerServiceTim2016-06-292-4/+4
| * | Added Bugzilla as external issue tracker optionTim2016-06-298-1/+109
* | | Merge branch 'fograckspace' into 'master' Stan Hu2016-06-292-0/+7
|\ \ \
| * | | Add fog-rackspace microgem to support backups using rackspace provider.jbub2016-06-292-0/+7
* | | | Merge branch '18663-avoid-extra-yaml-serializations' into 'master' Yorick Peterse2016-06-292-10/+38
|\ \ \ \
| * | | | Use update_columns to by_pass all the dirty code on active_recordPaco Guzman2016-06-292-10/+38
* | | | | Merge branch 'make-max-member-access-faster' into 'master' Yorick Peterse2016-06-293-12/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Reduce overhead and optimize ProjectTeam#max_member_access performanceStan Hu2016-06-293-12/+4
|/ / / /
* | | | Merge branch '19318-pipelines-find-git-calls' into 'master' Yorick Peterse2016-06-292-2/+3
|\ \ \ \
| * | | | PipelinesFinder use git cached data19318-pipelines-find-git-callsPaco Guzman2016-06-292-2/+3
| |/ / /
* | | | Merge branch '17295_discussion_note' into 'master' Jacob Schatz2016-06-292-0/+5
|\ \ \ \
| * | | | Update CHANGELOG17295_discussion_noteAlfredo Sumaran2016-06-281-1/+1
| * | | | Display user avatar inside of .discussion-bodyAlfredo Sumaran2016-06-281-0/+4
* | | | | Merge branch 'md-toolbar-multiline-code' into 'master' Jacob Schatz2016-06-292-12/+37
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Markdown toolbar inserts code blocksmd-toolbar-multiline-codePhil Hughes2016-06-272-12/+37
* | | | | Merge branch 'new-mr-avatar-alignment' into 'master' Jacob Schatz2016-06-291-1/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixed avatar alignment in new MR viewnew-mr-avatar-alignmentPhil Hughes2016-06-241-1/+8
* | | | | Merge branch 'zj-workhorse-format-patch' into 'master' Robert Speicher2016-06-296-24/+25
|\ \ \ \ \
| * | | | | Bump workhorse versionzj-workhorse-format-patchZ.J. van de Weg2016-06-282-5/+5
| * | | | | Workhorse to serve email diffsZ.J. van de Weg2016-06-285-23/+24
* | | | | | Merge branch 'system-info' into 'master' Josh Frye2016-06-299-2/+65
|\ \ \ \ \ \
| * | | | | | Add specssystem-infoJosh Frye2016-06-281-0/+17
| * | | | | | 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-285-10/+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-283-5/+6
| * | | | | | Show basic system info on admin panel. Closes #18886Josh Frye2016-06-286-0/+47
|/ / / / / /
* | | | | | Merge branch 'fix/group-visibility-ui-in-app-settings' into 'master' Jacob Schatz2016-06-282-1/+3
|\ \ \ \ \ \
| * | | | | | Add Changelog entry for group visibility fix in settingsGrzegorz Bizon2016-06-281-0/+2
| * | | | | | 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
* | | | | | | Update CHANGELOG for 8.8.6 and 8.7.8Robert Speicher2016-06-281-0/+8
* | | | | | | Merge branch 'as-fix-changelog' into 'master' 18999-switch-labels-and-weightJacob Schatz2016-06-281-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Fix CHANGELOGas-fix-changelogAlfredo Sumaran2016-06-281-1/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fix/builds-api-builds-for-commit-search' into 'master' Rémy Coutable2016-06-284-15/+58
|\ \ \ \ \ \ \
| * | | | | | | Remove redundant check in commit builds API endpointfix/builds-api-builds-for-commit-searchGrzegorz Bizon2016-06-281-2/+0
| * | | | | | | Add documentation for commit builds API improvementsGrzegorz Bizon2016-06-281-0/+5
| * | | | | | | Add Changelog entry for commit builds API fixGrzegorz Bizon2016-06-281-0/+1