Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2016-01-25Substituted deprecated forum link with project issues link. [ci skip]Jose Torres
2016-01-25Merge branch 'top-search-colors-and-element-position-is-not-like-in-design' ↵Jacob Schatz
into 'master' Adds base64 background search icon. All inputs of type `search` will have the gray background and search icon centered. Because the search magnifier is a bg image, I had to hide it with `[value=""]`. I added a little javascript to make sure each input always has it's own `value`. A text and icon placeholder in the center of the input that disappears when typed is only possible with javascript. If you just want the icon or just the text it can be done with css alone. If you want the icon/text justified left, then the search magnifier does not have to disappear. Fixes #11870 cc @skyruler @creamzy ![searchinput](/uploads/136ab91d4ff9ce717979d0ce1a23ab03/searchinput.gif) See merge request !2546
2016-01-25Merge branch 'update-gitlab-git' into 'master' Douwe Maan
Update gitlab_git & use new method for counting branches Corresponding gitlab_git merge request detailing some of the rationale behind this: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/62 Fixes #12418 See merge request !2535
2016-01-25Border radius to vars.Jacob Schatz
Only top search is gray.
2016-01-25Distinguishes between search inputs.Jacob Schatz
Main search input has different styles than secondary search inputs.
2016-01-25Removes extra spacesJacob Schatz
2016-01-25Make base64 image smaller by 5000 characters.Jacob Schatz
2016-01-25Adds base64 background search icon.Jacob Schatz
All inputs of type `search` will have the gray background and search icon centered. Because the search magnifier is a bg image, I had to hide it with `[value=""]`. I added a little javascript to make sure each input always has it's own value.
2016-01-24Merge branch 'rs-no-minified-js'Robert Speicher
Don't vendor minified JS Fixes #4031 See merge request !2494
2016-01-23Merge branch 'ignore-binary-files-in-git-grep' into 'master' Dmitriy Zaporozhets
Ignore binary files in code search to prevent Error 500 Leaving out the -I option in "git grep" would cause an Error 500 because the resulting line would include "Binary file X matches", which would cause the project search results to crash with the following error: ``` ActionView::Template::Error (wrong argument type nil (expected Regexp)): 1: - blob = @project.repository.parse_search_result(blob) 2: .blob-result 3: .file-holder 4: .file-title app/models/repository.rb:742:in `sub' app/models/repository.rb:742:in `block in parse_search_result_from_grep' app/models/repository.rb:741:in `each_line' app/models/repository.rb:741:in `parse_search_result_from_grep' app/models/repository.rb:682:in `parse_search_result' app/views/search/results/_blob.html.haml:1:in `_app_views_search_results__blob_html_haml__1959871337755590783_162450160' app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__2198486911700532411_58329920' app/views/search/show.html.haml:7:in `_app_views_search_show_html_haml___1698304427272645201_62235300' ``` See merge request !2565
2016-01-23Merge branch 'issuable-white-bg' into 'master' Jacob Schatz
Remove gray background from issue/mr/milestone background Fixes #6062 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler @creamzy See merge request !2573
2016-01-23Remove gray background from issue/mr/milestone backgroundDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-23Fix UI for pages with panelsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-22Merge branch 'issue_2239' into 'master' Dmitriy Zaporozhets
Provide a link for fetching merge requests from command line instructions Closes #2239 See merge request !2540
2016-01-22Merge branch 'solarized-dark-old-lines' into 'master' Robert Speicher
Make deleted line background color for Solarized Dark a little darker The difference is very slight, and I don't even _use_ Solarized Dark, but this annoyed me. See merge request !2563
2016-01-22Merge branch 'es_backport' into 'master' Dmitriy Zaporozhets
Backport some changes from EE See merge request !2548
2016-01-22Merge branch 'fix-comment-on-diff-ajax-loading'Dmitriy Zaporozhets
2016-01-22Merge branch 'fix-error-500-mr-search' into 'master' Dmitriy Zaporozhets
Fix Error 500 when doing a search for merge requests Potential fix for #11547 See merge request !2525
2016-01-22Ignore binary files in code search to prevent Error 500Stan Hu
Leaving out the -I option in "git grep" would cause an Error 500 because the resulting line would include "Binary file X matches"
2016-01-22Make old line background color for Solarized Dark a little more clearDouwe Maan
2016-01-22Backport some changes from EEValery Sizov
2016-01-22Merge branch 'fix-mr-diff-edit-button' into 'master' Robert Speicher
Fix MR diff 'Edit' button It now works and has the right size. See merge request !2542
2016-01-22Merge branch 'fix-diff-comments' into 'master' Robert Speicher
More highlighted diff fixes See merge request !2545
2016-01-22Merge branch 'unescaped-diffs' into 'master' Robert Speicher
Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544
2016-01-22Restore diff commentsDouwe Maan
2016-01-22Make sure non-highlighted diffs are still escapedDouwe Maan
2016-01-22Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher
Add method to calculate total size of artifacts in subpath See merge request !2500
2016-01-22Merge branch 'diff-highlight-themes' into 'master' Robert Speicher
Diff highlight themes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484 See merge request !2530
2016-01-22Fix MR diff 'Edit' buttonDouwe Maan
2016-01-22Add link for checkout MRs info.Rubén Dávila
2016-01-21Merge branch 'drag-drop-cursor' into 'master' Jacob Schatz
Milestone drag & drop cursor Fixes #4097 ![grab-cursor](/uploads/f5071d7e4839c3b4b88c9f7f1270eee3/grab-cursor.gif) cc @jschatz1 @creamzy See merge request !2532
2016-01-21Use branch_count in Repository#has_visible_content?Yorick Peterse
Gitlab::Git::Repository#branch_count is a tad faster than the previous setup. See gitlab-org/gitlab_git!62 for more information.
2016-01-21Merge branch 'fix/artifacts-download-progress-bar' into 'master' Grzegorz Bizon
Do not use progress bar when downloading build artifacts Closes #12491 See merge request !2531
2016-01-21Move build artifacts javascripts into separate fileGrzegorz Bizon
2016-01-21Milestone drag & drop cursorPhil Hughes
Fixes #4097
2016-01-21Make dark inline diffs a little more obviousDouwe Maan
2016-01-21Do not use progress bar when downloading build artifactsGrzegorz Bizon
Closes #12491
2016-01-21Pretty highlighted diffs for every themeDouwe Maan
2016-01-21Use consistent markup and styling for highlighting across blobs, diffs, ↵Douwe Maan
blame and snippets
2016-01-21Fix Error 500 when doing a search for merge requestsStan Hu
Potential fix for #11547
2016-01-21remove execution permissions from fontsPirate Praveen
2016-01-21Removes 100% width because it is a block element.Jacob Schatz
2016-01-21Implement new UI for paginationDmitriy Zaporozhets
2016-01-21Merge branch 'ui-is-broken-in-search-result-page' into 'master' Dmitriy Zaporozhets
Fix term height so text overflap does not happen. Fixes #12449 Height was set on the `.term`. It made the text overlap. See merge request !2518
2016-01-21Merge branch 'fix-project-creation' into 'master' Robert Speicher
Creator should be added as a master of the project on creation Fixes #4222 This also enable a project creator to add themselves as a master of the project for existing repositories that were created in the meanwhile that they don't appear as members. See merge request !2520
2016-01-21Merge branch ↵Dmitriy Zaporozhets
'show-message-to-signed-out-users-to-sign-in-if-they-want-to-comment' into 'master' Adds disabled comment field and disabled avatar. Fixes #3540 ![Screen_Shot_2016-01-20_at_12.13.29_AM](/uploads/673fb783e9aeae441df9c40bfe29ac1b/Screen_Shot_2016-01-20_at_12.13.29_AM.png) See merge request !2508
2016-01-21Fix indentation of methods chaining in CoffeeRémy Coutable
[ci skip]
2016-01-21Creator should be added as a master of the project on creationDouglas Barbosa Alexandre
This also enable a project creator to add themselves as a master of the project.
2016-01-21Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable
fix-comment-on-diff-ajax-loading
2016-01-21Address some JS coding-style and HTML semantic issuesRémy Coutable
- Replace 'rel' attributes with 'data' or 'id' attributes - Style jQuery methods chaining according to Jacob's guidelines - Rename a method