summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Remove text-rendering propertyRobert Speicher2015-11-101-1/+0
| | | | | | Closes #3220 [ci skip]
* Remove CSS property preventing hard tabs from rendering in Chromium 45Stan Hu2015-11-101-1/+0
| | | | | | | This is to workaround a bug in Chromium 45 (https://code.google.com/p/chromium/issues/detail?id=446434), which is the default browser in Ubuntu 14.04 and older. Closes #3220
* Merge remote-tracking branch 'origin/release-notes'Dmitriy Zaporozhets2015-11-106-5/+20
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix list rendering issue when dropdown was hidden in rowDmitriy Zaporozhets2015-11-062-2/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add release description to new tag formDmitriy Zaporozhets2015-11-051-0/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Create show page for tag and render release notes there and on index pageDmitriy Zaporozhets2015-11-052-3/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add ability to edit and show release notesDmitriy Zaporozhets2015-11-052-0/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'accept_mr_btn_ci_status' into 'master' Dmitriy Zaporozhets2015-11-091-0/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge button has color from CI status This MR closes #3313 I'am not realy sure about the color for the skipped status (red)... UI changes: ![accpet-mr-ci-failed](/uploads/c03970c468b89e38ed2c5e3171f53505/accpet-mr-ci-failed.png) ![accpet-mr-ci-skipped](/uploads/f29cbc69e77cc95b33522135b327cc51/accpet-mr-ci-skipped.png) ![accpet-mr-ci-pending](/uploads/79612a66fd497174e00bd348c9cba69c/accpet-mr-ci-pending.png) ![accpet-mr-ci-success](/uploads/4b601e6d02b860db5ff53c47c98f3206/accpet-mr-ci-success.png) See merge request !1761
| * | Merge button has color from CI statusBaldinof2015-11-061-0/+14
| | |
* | | Added Sherlock, a custom profiling tool for GitLabYorick Peterse2015-11-091-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sherlock will be a new GitLab specific tool for measuring the performance of Rails requests (and SideKiq jobs at some point). Some of the things that are currently tracked: * SQL queries along with their timings, backtraces and query plans (using "EXPLAIN ANALYZE" for PostgreSQL and regular "EXPLAIN" for MySQL) * Timings of application files (including views) on a per line basis * Some meta data such as the request method, path, total duration, etc More tracking (e.g. Rugged or gitlab-shell timings) might be added in the future. Sherlock will replace any existing tools we have used so far (e.g. active_record_query_trace and rack-mini-profiler), hence the corresponding Gems have been removed from the Gemfile. Sherlock can be enabled by starting Rails as following: ENABLE_SHERLOCK=1 bundle exec rails s Recorded transactions can be found at `/sherlock/transactions`.
* | | Render same markdown hint for issue, merge request, wiki and comment formsmarkdown-form-hintDmitriy Zaporozhets2015-11-072-1/+6
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'small-ui-improvements' into 'master' Dmitriy Zaporozhets2015-11-072-1/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small UI improvements to merge request page Make gray block under tabs identical height. Also same height have blocks on pages like `Groups` etc. So this improvement is targeted for consistency in UI too Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes internal issues * https://dev.gitlab.org/gitlab/gitlabhq/issues/2591 * https://dev.gitlab.org/gitlab/gitlabhq/issues/2592 cc @DouweM See merge request !1759
| * | Small UI improvements to merge request pagesmall-ui-improvementsDmitriy Zaporozhets2015-11-062-1/+4
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #9730 from ImanMh/masterDmitriy Zaporozhets2015-11-061-0/+3
|\ \ | | | | | | ugly outlines removed form sidebar
| * | ugly outlines removed form sidebarIman Mohamadi2015-10-141-0/+3
| | |
* | | Merge pull request #9788 from Thirumal-Sakthivel/select_box_uiDmitriy Zaporozhets2015-11-061-1/+1
|\ \ \ | | | | | | | | form-control class added to select box
| * | | defined class prepend-top-10 used for alignment issueThirumal S2015-11-051-4/+0
| | | |
| * | | merge conflict fixedThirumal S2015-11-0350-190/+436
| |\ \ \
| * | | | form group alignment issue fixed in webhook index pageThirumal S2015-10-301-0/+4
| | |/ / | |/| |
* | | | Merge pull request #9804 from ↵Dmitriy Zaporozhets2015-11-051-8/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | trimentor/9722-fix-alignment-of-event-items-and-its-children 9722 fix alignment of event items and its children
| * | | Add right margin to event-body..Kjel Delaey2015-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise text will flow under the "timeago" element. The original value was 80px (see commit 8b0906c8), but a value of 174px makes more sense. (see event-title `calc` function).
| * | | Make sure that multi-commit rows inside event bodies are aligned properly..Kjel Delaey2015-11-041-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent the second, third, ... rows from having a different indentation than the first commit row. Adding the extra "15px padding" to the event item prevents this. Having a 15px margin on the avatar only doesn't prevent this from happening.
| * | | Combine selectors because the same style is being appliedKjel Delaey2015-11-041-4/+1
| | | |
| * | | Apply the same rules to block event items..Kjel Delaey2015-11-041-10/+3
| | | | | | | | | | | | Try to avoid alignment issues as well.
| * | | Style inline event items with titles containing long words properly..Kjel Delaey2015-11-041-0/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a tablet in portrait mode with a width of 768px the event-title isn't aligned properly when the title contains a long string. This also happens when resizing your browser viewport on a desktop. Example string: Administrator pushed new branch feature-branch-with-a-very-long-name at Gitlab Org / Gitlab Test In the UI it would look like the example below: ---------- | | | AVATAR | less than a minute ago | | ---------- Administrator pushed new branch feature-branch-with-a-very-long-name at...
* | | Merge branch 'facebook-auth' into 'master' Robert Speicher2015-11-041-0/+0
|\ \ \ | | | | | | | | | | | | | | | | Add Facebook authentication See merge request !1740
| * | | Add Facebook authenticationDouwe Maan2015-11-031-0/+0
| |/ /
* | | Improvements to profile page UIimprove-profile-pageDmitriy Zaporozhets2015-11-044-6/+23
|/ / | | | | | | | | | | | | | | | | * add separator between tabs * show project avatars * fix tooltip offset on user calendar * remove gray hover for tabs Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'improve-profile-page'Dmitriy Zaporozhets2015-11-034-2/+38
|\ \
| * | Add extra padding between user description and links on profile pageDmitriy Zaporozhets2015-11-031-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Apply new design for user profile pageDmitriy Zaporozhets2015-11-033-1/+15
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Improve profile page UIDmitriy Zaporozhets2015-11-031-0/+22
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix clipboard button overflowDmitriy Zaporozhets2015-11-031-0/+4
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'olhado/gitlab-ce-commit-search'Dmitriy Zaporozhets2015-11-031-0/+2
|\ \
| * | Refactor search by commits messageolhado/gitlab-ce-commit-searchDmitriy Zaporozhets2015-11-021-0/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Persist blob editor's value on submit, not on clickrs-editor-submitRobert Speicher2015-10-312-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Prior, the value of the Ace editor was only being persisted if the user physically clicked the submit button, which the "quick submit" behavior doesn't do. Now the value will be properly transferred before any form is submitted.
* | | Add ability to create directories in the editorBen Ford2015-10-291-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Simply type a name with a `/` directory separator and new directories will be created. This does not do the fancy UI work that github.com does, but it will get the job done. I could not find tests for file creation, so I didn't add a test for this slight behaviour modification. I did test directory traversals though, using both absolute paths like `/tmp/foo.txt` and relative paths like `../../foo.txt`. Neither case escaped the repository, though attempting to traverse with a relative path resulted in a 500 error that did not affect application stability upon reload.
* | Merge branch 'rs-clipboard-js' into 'master' Dmitriy Zaporozhets2015-10-233-0/+43
|\ \ | | | | | | | | | | | | | | | | | | Add "Copy to clipboard" buttons See #2855 See merge request !1494
| * | Add clipboard buttons to each step of "How to merge"Robert Speicher2015-10-231-0/+9
| | |
| * | Add styling for cross-project-reference clipboard buttonRobert Speicher2015-10-231-0/+13
| | |
| * | Add copy_to_clipboard JSRobert Speicher2015-10-231-0/+21
| | |
* | | Merge branch 'fix-ci-regressions' into 'master' Robert Speicher2015-10-231-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI regressions This MR fixes a couple of small CI regressions - Allow developer to manage builds - On CI Admin page show only projects that are present in GitLab - On Runner CI Admin page show only projects that are present in GitLab - Refresh build log only when status changes - Show the oldest builds on top when viewing Builds - it most cases it shows running builds on top - Fix Lint rendering - Fix number of other builds in build widget Fixes #3164 Fixes #3161 Fixes gitlab-org/gitlab-ci#343 See merge request !1679
| * | Fix small CI UI regressionsKamil Trzcinski2015-10-231-1/+1
| | |
* | | Merge branch 'update-fonts' into 'master' Dmitriy Zaporozhets2015-10-2312-0/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Update SourceSansPro fonts Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1678
| * | Update SourceSansPro fontsupdate-fontsDmitriy Zaporozhets2015-10-2112-0/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'readme-extra-padding' into 'master' Dmitriy Zaporozhets2015-10-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add extra padding to README block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1671
| * | | Add extra padding to README blockDmitriy Zaporozhets2015-10-221-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'cleanup-css' into 'master' Dmitriy Zaporozhets2015-10-221-15/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve css code quality for projects.scss Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1674
| * | | | Improve css code quality for projects.scssDmitriy Zaporozhets2015-10-221-15/+14
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'rs-issuable-filter-count-style' into 'master' Dmitriy Zaporozhets2015-10-221-0/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of the filter counter for Issuables ## Before: ![Screen_Shot_2015-10-22_at_4.00.15_PM](/uploads/5f54faf3b056c1b3e2cb1b6d5c27614b/Screen_Shot_2015-10-22_at_4.00.15_PM.png) ## After: ![Screen_Shot_2015-10-22_at_3.58.04_PM](/uploads/127a90795aed7d41c053a735bbee0e3b/Screen_Shot_2015-10-22_at_3.58.04_PM.png) See merge request !1667