summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | the call site always specifies this optionhttp://jneen.net/2016-07-141-1/+0
| * | | do this thing in a clearer wayhttp://jneen.net/2016-07-141-3/+6
| * | | remove the unused inline_theme featurehttp://jneen.net/2016-07-141-10/+2
| * | | deprecate @anchorlinenoshttp://jneen.net/2016-07-141-10/+0
| * | | update rouge, gollum-lib, and github-markuphttp://jneen.net/2016-07-142-12/+12
| |/ /
* | | Merge branch '17341-firefox-u2f' into 'master' Robert Speicher2016-07-1516-47/+85
|\ \ \
| * | | Add a U2F feature spec for multiple devices owned by the same user.17341-firefox-u2fTimothy Andrew2016-07-145-21/+57
| * | | Use a single challenge for U2F authentication.Timothy Andrew2016-07-145-12/+18
| * | | Load Javascript U2F library selectively.Timothy Andrew2016-07-1410-22/+18
* | | | Merge branch 'dont-ask-nearlythere' into 'master' Achilleas Pipinellis2016-07-151-1/+1
|\ \ \ \
| * | | | Don't ask Heather to review documentation MR'sdont-ask-nearlythereJacob Vosmaer (GitLab)2016-07-151-1/+1
* | | | | Merge branch 'kradydal/gitlab-ce-create-todos-when-issue-author-assigne-or-me...Douwe Maan2016-07-153-17/+22
|\ \ \ \ \
| * | | | | When Issue author assign or mention himself Todos are createdKatarzyna Kobierska2016-07-143-17/+22
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix/project-export-filename' into 'master' Douwe Maan2016-07-155-3/+33
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-exp...fix/project-export-filenameJames Lopez2016-07-156-26/+56
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-exp...James Lopez2016-07-1518-65/+53
| |\ \ \ \ \
| * | | | | | add project name and namespace to filename on project exportJames Lopez2016-07-155-3/+33
* | | | | | | Merge branch 'fix-mentioned-users-on-diff-notes' into 'master' Douwe Maan2016-07-154-6/+28
|\ \ \ \ \ \ \
| * | | | | | | Update CHANGELOGfix-mentioned-users-on-diff-notesDouglas Barbosa Alexandre2016-07-151-0/+1
| * | | | | | | Use cattr_accessor instead duplicating code on NoteOnDiff concernDouglas Barbosa Alexandre2016-07-153-9/+9
| * | | | | | | Fix mentioned users list on diff notesDouglas Barbosa Alexandre2016-07-152-0/+21
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix-creating-group-with-space-in-group-path'Douwe Maan2016-07-153-5/+18
|\ \ \ \ \ \ \
| * | | | | | | Update CHANGELOGfix-creating-group-with-space-in-group-pathDouglas Barbosa Alexandre2016-07-141-0/+1
| * | | | | | | Fix creating group with space in group pathDouglas Barbosa Alexandre2016-07-142-5/+17
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix/ee-to-ce-import'Douwe Maan2016-07-153-2/+8
|\ \ \ \ \ \ \
| * | | | | | | added changelogfix/ee-to-ce-importJames Lopez2016-07-141-0/+1
| * | | | | | | fix EE => CE project import, and updated JSON specJames Lopez2016-07-142-2/+7
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'revert-lock-for-issuable' into 'master' Robert Speicher2016-07-159-76/+13
|\ \ \ \ \ \ \
| * | | | | | | Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuableStan Hu2016-07-139-76/+13
| |/ / / / / /
* | | | | | | Merge branch 'update-rubocop' into 'master' Robert Speicher2016-07-154-364/+473
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Disable all cops with offenses.Connor Shea2016-07-131-149/+34
| * | | | | | Resolve feedback.Connor Shea2016-07-133-55/+44
| * | | | | | Disable two cops as recommended.Connor Shea2016-07-132-26/+24
| * | | | | | Remove some disabled cops.Connor Shea2016-07-132-378/+552
| * | | | | | Update rubocop to 0.41.2Z.J. van de Weg2016-07-134-11/+74
* | | | | | | Merge branch 'disable-statement-timeout' into 'master' Robert Speicher2016-07-153-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Fix spec Don't attempt to disable statement timeout on a MySQL DBdisable-statement-timeoutStan Hu2016-07-141-0/+4
| * | | | | | | Disable statement timeout outside of transaction and during adding concurrent...Stan Hu2016-07-141-1/+3
| * | | | | | | Disable PostgreSQL statement timeout during migrationsStan Hu2016-07-142-0/+9
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix/import-issues-last-updated' into 'master' Robert Speicher2016-07-154-26/+41
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | updated changelogfix/import-issues-last-updatedJames Lopez2016-07-141-0/+1
| * | | | | | fixed similar issue with gitlab.com importer because why not!James Lopez2016-07-141-25/+28
| * | | | | | fix updated_at not preserved after import - for GitLab projectsJames Lopez2016-07-142-1/+12
* | | | | | | Merge branch 'collapse-diffs-more' into 'master' Fatih Acet2016-07-151-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Change bg color of collapsed diff to blue on hovercollapse-diffs-moreAnnabel Dunstone2016-07-141-0/+5
| * | | | | | | Reduce padding on collapsed diff messageSean McGivern2016-07-141-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'issuable-sidebar-collapsed-tooltip' into 'master' Fatih Acet2016-07-153-2/+7
|\ \ \ \ \ \ \
| * | | | | | | CHANGELOGissuable-sidebar-collapsed-tooltipPhil Hughes2016-07-131-0/+1
| * | | | | | | Changed collapsed assignee tooltip to users namePhil Hughes2016-07-132-2/+6
* | | | | | | | Merge branch 'fix-navbar-icon' into 'master' Fatih Acet2016-07-151-2/+2
|\ \ \ \ \ \ \ \