summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix styling of tag pagetag-page-updatesAnnabel Dunstone2016-07-182-32/+42
* Merge branch 'legacy-diff-notes-are-dumb' into 'master' Douwe Maan2016-07-152-3/+3
|\
| * Don't fail when a LegacyDiffNote didn't store the right diffDouwe Maan2016-07-152-3/+3
* | Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6Douwe Maan2016-07-1511-61/+53
* | Don't fail when Ci::Pipeline doesn't have a projectDouwe Maan2016-07-151-0/+2
|/
* Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-151-6/+3
|\
| * use %(...) and %[...] in favor of %<...>feature.rouge-20http://jneen.net/2016-07-141-1/+1
| * kill the nowrap optionhttp://jneen.net/2016-07-141-2/+3
| * rm dead `highlighter` methodhttp://jneen.net/2016-07-141-4/+0
* | Merge branch '17341-firefox-u2f' into 'master' Robert Speicher2016-07-1510-31/+36
|\ \
| * | Add a U2F feature spec for multiple devices owned by the same user.17341-firefox-u2fTimothy Andrew2016-07-144-10/+13
| * | Use a single challenge for U2F authentication.Timothy Andrew2016-07-142-7/+15
| * | Load Javascript U2F library selectively.Timothy Andrew2016-07-148-22/+16
* | | Merge branch 'kradydal/gitlab-ce-create-todos-when-issue-author-assigne-or-me...Douwe Maan2016-07-151-2/+1
|\ \ \
| * | | When Issue author assign or mention himself Todos are createdKatarzyna Kobierska2016-07-141-2/+1
* | | | Merge branch 'fix/project-export-filename' into 'master' Douwe Maan2016-07-151-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-exp...James Lopez2016-07-1517-65/+52
| |\ \ \ \
| * | | | | add project name and namespace to filename on project exportJames Lopez2016-07-151-1/+1
* | | | | | Merge branch 'fix-mentioned-users-on-diff-notes' into 'master' Douwe Maan2016-07-152-6/+9
|\ \ \ \ \ \
| * | | | | | 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-151-0/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-creating-group-with-space-in-group-path'Douwe Maan2016-07-151-1/+1
|\ \ \ \ \ \
| * | | | | | Fix creating group with space in group pathDouglas Barbosa Alexandre2016-07-141-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'revert-lock-for-issuable' into 'master' Robert Speicher2016-07-154-24/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuableStan Hu2016-07-134-24/+2
| | |_|/ / | |/| | |
* | | | | 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-152-2/+6
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | navbar_icon was renamed to custom_icon in:fix-navbar-iconLin Jen-Shin2016-07-151-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '4424-improve-ui-admin-area' into 'master' Dmitriy Zaporozhets2016-07-157-54/+31
|\ \ \ \ \ \
| * | | | | | Add visibility icon4424-improve-ui-admin-areaAlfredo Sumaran2016-07-141-0/+3
| * | | | | | Remove previously introduced CSS that will not be used anymoreAlfredo Sumaran2016-07-141-23/+0
| * | | | | | Make admin/groups view consistent with dashboard/groupsAlfredo Sumaran2016-07-141-17/+20
| * | | | | | Fix New Group button spacing on mobileAlfredo Sumaran2016-07-141-1/+1
| * | | | | | Make CSS consistent againAlfredo Sumaran2016-07-143-11/+5
| * | | | | | Rename .group-controls to .controlsAlfredo Sumaran2016-07-142-3/+3
| * | | | | | Remove unnecesary CSS classAlfredo Sumaran2016-07-142-2/+2
* | | | | | | Merge branch 'update-permissions-links' into 'master' Achilleas Pipinellis2016-07-156-7/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Update permissons links to new pageupdate-permissions-linksSean McGivern2016-07-146-7/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'update-branch-names-in-gc' into 'master' Jacob Vosmaer (GitLab)2016-07-151-1/+3
|\ \ \ \ \ \
| * | | | | | Refresh branch cache after `git gc`Stan Hu2016-07-131-1/+3
* | | | | | | Merge branch 'gl-dropdown-issuable-form' into 'master' Jacob Schatz2016-07-1511-53/+61
|\ \ \ \ \ \ \
| * | | | | | | Dropdown chevron alignmentgl-dropdown-issuable-formPhil Hughes2016-07-071-1/+1
| * | | | | | | Updated testsPhil Hughes2016-07-073-5/+5
| * | | | | | | GL dropdowns in issuable formPhil Hughes2016-07-079-50/+58
* | | | | | | | Merge branch 'projects-blank-state' into 'master' Jacob Schatz2016-07-157-82/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | Dashboard projects blank stateprojects-blank-statePhil Hughes2016-07-087-82/+56
View Lorry Controller Status