summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Removed emoji button from notes formnote-form-designPhil Hughes2016-04-051-3/+0
| | | | |
| * | | | SCSS colors into variablesPhil Hughes2016-04-045-26/+31
| | | | |
| * | | | Removed console.log from notesPhil Hughes2016-04-041-3/+0
| | | | |
| * | | | Updated testsPhil Hughes2016-04-043-7/+11
| | | | |
| * | | | Commits comment test updatePhil Hughes2016-04-041-1/+1
| | | | |
| * | | | Tests updatePhil Hughes2016-04-045-6/+6
| | | | |
| * | | | Reduced focus shadowPhil Hughes2016-04-041-1/+2
| | | | |
| * | | | Logged out boxPhil Hughes2016-04-044-49/+28
| | | | |
| * | | | Discussion formPhil Hughes2016-04-043-17/+27
| | | | |
| * | | | Removed css code that isnt usedPhil Hughes2016-04-043-39/+0
| | | | |
| * | | | Focus style for comment formPhil Hughes2016-04-044-14/+33
| | | | |
| * | | | Hides current user icon on mobilePhil Hughes2016-04-042-2/+8
| | | | |
| * | | | Added toolbar to comment formPhil Hughes2016-04-049-108/+129
| | | | |
| * | | | Restyling on elements in comment formPhil Hughes2016-04-0411-76/+76
| | | | |
| * | | | Started refactoring of note formPhil Hughes2016-04-046-39/+27
| | | | |
* | | | | The Markdown doc is one place where trailing whitespace mattersRobert Speicher2016-04-051-4/+4
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'markdown-attribution' into 'master' Sytse Sijbrandij2016-04-051-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attribution where it is due. Inspired by https://news.ycombinator.com/item?id=11431969 See merge request !3546
| * | | | | Attribution where it is due.markdown-attributionSytse Sijbrandij2016-04-051-7/+7
| | | | | |
* | | | | | Merge branch 'upgrade-bundler-audit' into 'master' Robert Speicher2016-04-052-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade bundler-audit from 0.4.0 to 0.5.0 Bundler Audit can now run the `check` command with an `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI ([source](https://github.com/rubysec/bundler-audit#synopsis)). See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2015-02-28 See merge request !3433
| * | | | | Upgrade bundler-audit from 0.4.0 to 0.5.0connorshea2016-03-282-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bundler Audit can now run check with the `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI. See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2 015-02-28
* | | | | | Merge branch 'fix/permissions-when-importing-members' into 'master' Douwe Maan2016-04-053-3/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check permissions when importing project members Closes #14899 See merge request !3535
| * | | | | | Respond 404 when unauthorized user imports membersfix/permissions-when-importing-membersGrzegorz Bizon2016-04-052-3/+3
| | | | | | |
| * | | | | | Do not leak project exists when importing membersGrzegorz Bizon2016-04-052-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing members, and user does not have permissions to read members in a source project, do not leak information about source project existence. Notifiy user that project has not been found instead.
| * | | | | | Check permissions when importing project membersGrzegorz Bizon2016-04-053-2/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14899
* | | | | | | Add 8.4.6 and 8.4.7 CHANGELOG itemsRémy Coutable2016-04-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Add 8.5.9 CHANGELOG itemRémy Coutable2016-04-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'doc_ldap_fixes' into 'master' Achilleas Pipinellis2016-04-052-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix LDAP link and codeblock indentation See merge request !3538
| * | | | | | | Fix LDAP link and codeblock indentationdoc_ldap_fixesAchilleas Pipinellis2016-04-052-7/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'reorder-language' into 'master' Yorick Peterse2016-04-052-7/+21
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Update language after doing all other operations See merge request !3533
| * | | | | | Update language only on HEAD of the repositoryreorder-languageKamil Trzcinski2016-04-052-4/+17
| | | | | | |
| * | | | | | Update language after doing all other operationsKamil Trzcinski2016-04-051-3/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'build-notification-changelog' into 'master' Jacob Schatz2016-04-051-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added CHANGELOG for build notifications [ci skip] See merge request !3537
| * | | | | | Added CHANGELOG for build notificationsPhil Hughes2016-04-051-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'scss-lint-comments' into 'master' Jacob Schatz2016-04-051-0/+105
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add comments to the SCSS Lint config file [ci skip] This MR also adds some previously missing linters. See merge request !3500
| * | | | | | Add comments to the SCSS Lint config file [ci skip]connorshea2016-04-041-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add some previously missing linters.
* | | | | | | Merge branch 'missing-changelog' into 'master' Jacob Schatz2016-04-051-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing changelog item about improving navigation sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For !3494 and #14838 See merge request !3527
| * | | | | | Add missing changelog item about improving navigation sidebarmissing-changelogDmitriy Zaporozhets2016-04-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'fix-gh-pr-import' into 'master' Yorick Peterse2016-04-054-0/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Importing repos from GHE doesn't work See merge request !3529
| * | | | | | | Flush repository cache before import project datafix-gh-pr-importDouglas Barbosa Alexandre2016-04-044-0/+38
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitHub Pull Requests importer handle with the repository while importing data, we need to make sure that the cached values are valid.
* | | | | | | Merge branch 'banzai-image-link' into 'master' Robert Speicher2016-04-057-2/+61
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to image URL for images in discussions. The main problem with this is that it doesn't apply retroactively, only to images that are uploaded after this change. It's also hacky and probably not the most optimal solution. Resolves #14411. See merge request !3464
| * | | | | | Wrap images in discussions and wikis with a link to the image source using ↵connorshea2016-04-047-2/+61
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ImageLinkFilter. Resolves #14411. See merge request !3464
* | | | | | Merge branch 'remove-2fa-status' into 'master' Jacob Schatz2016-04-041-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 2FA status on enable page The 2FA status on the enabling page is useless, since it always is `disabled`. A user is enabling 2FA, so he already knows that it is disabled. ### Before ![Screenshot_2016-03-29_12.41.27](/uploads/4800a13a82f176077a11ecaf13ed0cb1/Screenshot_2016-03-29_12.41.27.png) ### After ![Screenshot_2016-03-29_12.40.55](/uploads/a77e8acd7cf99190bbd6bd340542ad10/Screenshot_2016-03-29_12.40.55.png) See merge request !3436
| * | | | | | Remove 2FA status on enable pageremove-2fa-statusRobert Schilling2016-03-291-2/+0
| | | | | | |
* | | | | | | Merge branch 'admin-pages-layout' into 'master' Dmitriy Zaporozhets2016-04-043-35/+49
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI for admin/groups page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !3523
| * | | | | | Single quotes paradiseadmin-pages-layoutDmitriy Zaporozhets2016-04-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Improve UI for admin/groups pageDmitriy Zaporozhets2016-04-043-35/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceYorick Peterse2016-04-045-9/+11
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dz-admin-area-fixes' into 'master' Jacob Schatz2016-04-045-9/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set of UI fixes for admin area See merge request !3525
| | * | | | | | | Fix missing paddings in admin areaDmitriy Zaporozhets2016-04-044-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | Dont use monospace font for namesDmitriy Zaporozhets2016-04-041-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>