summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'diff-white-line-fix' into 'master' Jacob Schatz2016-01-181-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes white line when hiding diff comments in MR Fixes #6071 See merge request !2407
| | * | | | Removes white line when hiding diff comments in MRPhil Hughes2016-01-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #6071
| * | | | | Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into ↵Dmitriy Zaporozhets2016-01-181-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixes issue where firefox does not delete message after comment submit Issue was **not** in the way comment was being submitted. `app/assets/javascripts/awards_handler.coffee` was throwing an error. This error was preventing any js from running after it. Fixes #1473 See merge request !2452
| | * | | | Fixes issue where firefox does not delete message after comment submitcomment-text-remains-in-text-box-after-submitting-itJacob Schatz2016-01-151-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Issue was **not** in the way comment was being submitted. `app/assets/javascripts/awards_handler.coffee` was throwing an error. This error was preventing any js from running after it. Fixes #1473
| * | | | Merge branch 'issue-page-keeps-jumping-up' into 'master' Dmitriy Zaporozhets2016-01-173-1/+36
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue page keeps jumping up This happens when the discussion side is smaller than the sidebar and the sidebar will need to scroll. When this happens I calculate the height of the two and see if the discussion panel is smaller and make them the same height and add a class `no-affix` which makes the sidebar relative positioning so it won't stick to the top. See merge request !2417
| | * | | | fixes scrollbar jump by making discussion the same size as the sidebar when ↵issue-page-keeps-jumping-upJacob Schatz2016-01-134-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | sidebar is bigger, and not allowing affix to do fixed position on the sidebar
| | * | | | initial fixJacob Schatz2016-01-133-5/+12
| | | |/ / | | |/| |
| * | | | Autosize the textarea in showEditFormRobert Speicher2016-01-161-0/+1
| | |/ / | |/| | | | | | | | | | [ci skip]
| * | | Merge branch 'fix-alignment-issue' into 'master' Jacob Schatz2016-01-155-15/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment issues after a fix on titles weight Fixes #8102. Fixes #3956. This fixes an alignment regression introduced by !2422. Sorry about that! :/ ## Commit title alignment fixed ![Screen_Shot_2016-01-14_at_16.10.01](/uploads/8fdc08dca379bc551f5872de910c7149/Screen_Shot_2016-01-14_at_16.10.01.png) **The fact that the first row has a smaller height than the other rows was not introduced by !2422 (I've checked by reverting 818607f0 on `master`).** ## Tags name in list ![Screen_Shot_2016-01-14_at_16.10.09](/uploads/fba3978037677bb8855f374b5f38dde0/Screen_Shot_2016-01-14_at_16.10.09.png) See merge request !2431
| | * | | Remove unnecessary classRémy Coutable2016-01-151-4/+0
| | | | |
| | * | | Streamline item titles to use a single class, and add back strong tagsRémy Coutable2016-01-154-11/+2
| | | | |
| | * | | Fix alignment issues after a fix on titles weightRémy Coutable2016-01-142-2/+2
| | | | |
| * | | | Merge branch ↵Robert Speicher2016-01-151-4/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'deleting-a-note-after-editing-another-results-in-a-javascript-error' into 'master' Fix javascript error with deleting messages in issue or merge request Elements searched for by jQuery no longer existed in the DOM. Javascript was also unnecessarily complex, for using jQuery Fixes #8109 See merge request !2442
| | * | | | Fix javascript error with deleting messages in issue or merge requestdeleting-a-note-after-editing-another-results-in-a-javascript-errorJacob Schatz2016-01-141-4/+5
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Elements searched for by jQuery no longer existed in the DOM. Javascript was also unnecessarily complex, for using jQuery Fixes #8109
| * | | | Prefer custom WOFF2 fonts if the browser supports themRobert Speicher2016-01-1413-4/+20
| |/ / / | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'master' into issue_3945Rubén Dávila2016-01-1494-712/+756
|\ \ \ \ | |/ / /
| * | | fixes margin and paddingJacob Schatz2016-01-141-1/+1
| | | |
| * | | Merge branch 'rs-fix-cross-reference' into 'master' Robert Speicher2016-01-141-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross-project reference clipboard text See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2339 See merge request !2420
| | * | | centering copy buttonrs-fix-cross-referenceJacob Schatz2016-01-131-0/+1
| | | | |
| | * | | Fix cross-project reference clipboard textRobert Speicher2016-01-131-1/+5
| | | |/ | | |/| | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/4183
| * | | Fix css mess around git clone panel. Align it properlyDmitriy Zaporozhets2016-01-141-88/+43
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix missing padding for user/group pagesDmitriy Zaporozhets2016-01-141-5/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-141-12/+13
| |\ \ \
| | * \ \ Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-141-12/+13
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub wiki into GitLab Closes #2834 GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported. Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags. ##### Before `WikiPipeline`: ![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png) ##### After `WikiPipeline`: ![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png) See merge request !2324
| | | * | Move js function to removing accents to vendor/assets/javascriptsDouglas Barbosa Alexandre2016-01-141-7/+3
| | | | |
| | | * | Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-141-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since GitHub doesn’t apply these constraints to theirs wiki slug allowing characters like `,`, `:`, `*`, etc, we need to relax our constraints or some wiki pages will not be available after they were imported. For an example the Devise project have a wiki page with the following slug: “How To: Add sign_in, sign_out, and sign_up links to your layout template”
| * | | | Merge remote-tracking branch 'origin/rs-autosize'Dmitriy Zaporozhets2016-01-144-0/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix missing autosize requirers-autosizeRobert Speicher2016-01-131-0/+1
| | | | |
| | * | | Autosize textareasRobert Speicher2016-01-134-0/+7
| | | |/ | | |/|
| * | | Merge branch 'new-buttons-everywhere' into 'master' Dmitriy Zaporozhets2016-01-149-82/+60
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Standartize buttons and fields size Fixes #8069 and #8070 See merge request !2428
| | * | Standartize buttons and fields sizeDmitriy Zaporozhets2016-01-149-82/+60
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'closing-mr-bug-fix' into 'master' Dmitriy Zaporozhets2016-01-142-6/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug with commenting on merge requests See merge request !2415
| | * | | fixes bug with commenting on merge requestsclosing-mr-bug-fixJacob Schatz2016-01-132-6/+11
| | | |/ | | |/|
| * | | Merge branch 'remove-gray-bg'Dmitriy Zaporozhets2016-01-1429-284/+113
| |\ \ \ | | | |/ | | |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Update files/diffs to match new layoutDmitriy Zaporozhets2016-01-146-11/+20
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Fix files, project settings and few more pages with new layoutDmitriy Zaporozhets2016-01-143-2/+12
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Use closest instead of parent()Dmitriy Zaporozhets2016-01-131-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Dont use nav-pills. Instead use nav-listsDmitriy Zaporozhets2016-01-132-12/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Replace nav-tabs with nav-linksDmitriy Zaporozhets2016-01-135-72/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Add top margin for page titleDmitriy Zaporozhets2016-01-131-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Apply new layout to user pageDmitriy Zaporozhets2016-01-131-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Allign md header componentsDmitriy Zaporozhets2016-01-132-8/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Increase detail-page-header padding to match height with nav-linkDmitriy Zaporozhets2016-01-131-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Replace all navigation menu with nav-links classDmitriy Zaporozhets2016-01-139-20/+21
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Start moving all navigation to one classDmitriy Zaporozhets2016-01-136-135/+39
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | New layout without background colorDmitriy Zaporozhets2016-01-1313-33/+24
| | |/ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'fix/titles-weight' into 'master' Douwe Maan2016-01-146-2/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages See #3956. Following is before/after for each page: ## Group title ### Before ![group-title-before](/uploads/d6c013c69f526d553555ff974c29b349/group-title-before.png) ### After ![group-title-after](/uploads/56e0bd176d12943297b5b95d20beb437/group-title-after.png) --- ## Commit title ### Before ![commit-title-before](/uploads/a9bda5212eea843ab4c92acbcf411cdd/commit-title-before.png) ### After ![commit-title-after](/uploads/e3a532460a1e7b0b2a8eb8a6af12abea/commit-title-after.png) --- ## Branch name ### Before ![branch-name-before](/uploads/9d77e39f07cd7b757d02a39f5bc57570/branch-name-before.png) ### After ![branch-name-after](/uploads/6831e9560d196d8a4da209166f224a0f/branch-name-after.png) --- ## Tags name in list ### Before ![tags-name-in-list-before](/uploads/cf0141713af751132fd29220621ea9ab/tags-name-in-list-before.png) ### After ![tags-name-in-list-after](/uploads/902c5b029dc832216ac536d2ad372b83/tags-name-in-list-after.png) --- ## Tag name ### Before ![tags-name-before](/uploads/495acb6b4bab8464a0ffeb8f703435b6/tags-name-before.png) ### After ![tags-name-after](/uploads/f86868dbad57b8226611bcb03e5a9524/tags-name-after.png) --- ## Issue title in list ### Before ![issue-title-in-list-before](/uploads/5f01450aceefdcc2f51984832a4ce6b5/issue-title-in-list-before.png) ### After ![issue-title-in-list-after](/uploads/3144fb231874d23b6b46e108da24b128/issue-title-in-list-after.png) --- ## MR title in list ### Before ![mr-title-in-list-before](/uploads/bd0239104ebf4a5090c724c3851df57c/mr-title-in-list-before.png) ### After ![mr-title-in-list-after](/uploads/16be5460dffc33ff173a6b8ff3250206/mr-title-in-list-after.png) See merge request !2422
| | * | Improve the consistency of commit titles, branch names, tag names, issue/MR ↵fix/titles-weightRémy Coutable2016-01-146-2/+17
| | |/ | | | | | | | | | titles, on their respective project pages
| * | Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-141-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users: ![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png) There will be another MR for the EE version. See merge request !2242
| | * | Fix Admin/Users view to position buttons without spacing magicGabriel Mazetto2016-01-141-0/+3
| | | |
View Lorry Controller Status