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
AgeCommit message (Collapse)Author
2015-12-24nav full widthnew-list-marginAndriy Dyadyura
2015-12-24Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Andriy Dyadyura
new-list-margin
2015-12-24Merge branch 'rs-bump-underscore-rails' into 'master' Dmitriy Zaporozhets
Bump underscore-rails to ~> 1.8.0 Addresses #2857 See merge request !2193
2015-12-24Merge branch 'filter-project-list-fix' into 'master' Dmitriy Zaporozhets
fixes the search for projects Also makes improvements for jQuery queries. <br/> @creamzy @skyruler <br/> Fixes issues introduced in MR for #3943 See merge request !2194
2015-12-24Merge branch 'its-its' into 'master' Robert Speicher
Fix spelling of "it's" to "its" where appropriate. [ci skip] See merge request !2196
2015-12-24Fix spelling of "it's" to "its" where appropriate.cafuego
2015-12-24fixes the search for projectsJacob Schatz
2015-12-24Merge branch 'fix-error-500-global-search-issues' into 'master' Dmitriy Zaporozhets
Fix Error 500 when doing a search in dashboard before visiting any project If a search turned up an issue, under certain conditions you would see this error: ``` ActionView::Template::Error (undefined method `path_with_namespace' for nil:NilClass): 6: - if issue.description.present? 7: .description.term 8: = preserve do 9: = search_md_sanitize(markdown(issue.description)) 10: %span.light 11: #{issue.project.name_with_namespace} 12: - if issue.closed? lib/gitlab/markdown/upload_link_filter.rb:36:in `build_url' lib/gitlab/markdown/upload_link_filter.rb:31:in `process_link_attr' lib/gitlab/markdown/upload_link_filter.rb:18:in `block in call' lib/gitlab/markdown/upload_link_filter.rb:17:in `call' lib/gitlab/markdown.rb:127:in `gfm' lib/gitlab/markdown.rb:24:in `render' app/helpers/gitlab_markdown_helper.rb:61:in `markdown' app/views/search/results/_issue.html.haml:9:in `block in _app_views_search_results__issue_html_haml__4127460390996300432_59973760' app/views/search/results/_issue.html.haml:8:in `_app_views_search_results__issue_html_haml__4127460390996300432_59973760' app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__589475855773452465_61761440' app/views/search/show.html.haml:5:in `_app_views_search_show_html_haml___1852335078065998536_69780120' ``` Confirmed this is issue still happens in GitLab 8.4, and it also happens on GitLab.com. Here's how to reproduce: 1. Login in a new browser. 2. Enter a search term on the top right that will land a hit in the "Issues" (e.g. GitLab). 3. Click on "Issues" tab. You should get an Error 500. The issue is that @project isn't assigned to anything. See merge request !2110
2015-12-23Merge branch 'make-migrations-reversible' into 'master' Robert Speicher
Make migrations reversible See merge request !2191
2015-12-23Bump underscore-rails to ~> 1.8.0Robert Speicher
Addresses #2857
2015-12-23Make migrations reversibleKamil Trzcinski
2015-12-23Merge branch 'new-project-button-seperate-from-filter-name' into 'master' Dmitriy Zaporozhets
New project button with filter in header. Fixes #3943 ![Screen_Shot_2015-12-21_at_3.47.01_PM](/uploads/f7f952440b4bb4b55f62241bbc328c95/Screen_Shot_2015-12-21_at_3.47.01_PM.png) See merge request !2165
2015-12-23Merge branch 'button-height' into 'master' Dmitriy Zaporozhets
Button height old ![Screenshot_2015-12-23_15.48.12](/uploads/0e6c5696262475c197f8fcbf00199132/Screenshot_2015-12-23_15.48.12.png) new ![Screenshot_2015-12-23_15.48.45](/uploads/1d6bdf96f7c90b65f4a6b21df3951370/Screenshot_2015-12-23_15.48.45.png) also including MR page See merge request !2188
2015-12-23new tabs for buildsnew-tabs-buildsAndriy Dyadyura
2015-12-23Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Andriy Dyadyura
new-tabs-builds
2015-12-23fixes spacing between new project button and inputJacob Schatz
2015-12-23moves border bottom to `left-menu-top` class.Jacob Schatz
2015-12-23new button sizesAndriy Dyadyura
2015-12-23Merge branch 'add-project-permissions' into 'master' Dmitriy Zaporozhets
Add project permissions to all project API endpoints This standardizes all the project API formats. Also needed to support Huboard. See merge request !2090
2015-12-23Merge branch 'double-border-on-no-comments' into 'master' Dmitriy Zaporozhets
border bottom for last comment fixes double line issue Since image uploading isn't working atm. Will upload screenshots when it works again. https://unsee.cc/mosapine/ Fixes #3955 See merge request !2175
2015-12-23new button sizesAndriy Dyadyura
2015-12-23fixing conflict.Jacob Schatz
2015-12-23Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Andriy Dyadyura
button-height
2015-12-23Merge branch 'new-buttons' into 'master' Dmitriy Zaporozhets
New buttons OLD ![Screenshot_2015-12-22_21.42.59](/uploads/79e85727586f7b917b8ab9ef867e79dc/Screenshot_2015-12-22_21.42.59.png) NEW ![Screenshot_2015-12-22_21.42.21](/uploads/aee54160f17e0502e14ca5c754dcfe50/Screenshot_2015-12-22_21.42.21.png) See merge request !2179
2015-12-23adds css for `left-top-menu`. Also hides buttons in certain for factors.Jacob Schatz
2015-12-23Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Andriy Dyadyura
button-height
2015-12-23project headerJacob Schatz
2015-12-23Merge branch 'fix/ci-runners-token-persistence' into 'master' Grzegorz Bizon
Fix method that ensures authentication token Until now, `ensure_#{token_filed_name}!` method didn't persist new token in database. This closes #4235. See merge request !2185
2015-12-23Merge branch 'rs-update-jquery' into 'master' Dmitriy Zaporozhets
Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0 Closes #2859 See merge request !2183
2015-12-23Fix close/reopen buttonsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-23Merge branch 'meta-example' into 'master' Sytse Sijbrandij
Link to the gitlab-ci.yml file of GitLab itself. I'm hunting for this link from time to time in customer demo's so I think it is useful to add. /cc @ayufan See merge request !1993
2015-12-23Merge branch 'master' into new-buttonsDmitriy Zaporozhets
2015-12-23Merge branch 'rs-update-sass-rails' into 'master' Dmitriy Zaporozhets
Bump sass-rails to ~> 5.0.0 Addressing gitlab-org/gitlab-ce#2857 See merge request !2184
2015-12-23Merge branch 'improve_emoji_picker' into 'master' Dmitriy Zaporozhets
Improve emoji picker This request uses an emoji image sprite to show big set of emojis. The sprite has been made based one gemojione gem images. The categories are retrieved from https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json as well. Some categories are pretty poor, it can be extended in the future. It's a first step on the way to improve picker. The first implementation was using https://github.com/iamcal/emoji-data project, but there was huge incompatibility with gemojione emojis set and I had to drop that solution. ![Screenshot_2015-12-22_23.26.27](/uploads/7d323eb0586204ac92915b41233b97ec/Screenshot_2015-12-22_23.26.27.png) See merge request !2172
2015-12-23Use method that creates runners registration tokenGrzegorz Bizon
`runners_registration_token` now creates a new token if it is blank.
2015-12-23Merge branch 'fix/ci-lint' into 'master' Grzegorz Bizon
Make CI Lint form synchronous This removes `remote: true` from CI Lint form, making it synchronous form. This also removes some complexity related to displaying lint messages. View also has been updated, removed deprecated Bootstrap 2 tags. Improved design. See merge request !2171
2015-12-23Add method that persist ensured token in `TokenAuthenticatable`Grzegorz Bizon
2015-12-23Fix method that ensures authentication tokenGrzegorz Bizon
Until now, `ensure_#{token_filed_name}` method didn't persist new token in database. This closes #4235.
2015-12-23Fix paths for jquery-ui assetsRobert Speicher
2015-12-23Bump sass-rails to ~> 5.0.0Robert Speicher
2015-12-23buttons colors updateAndriy Dyadyura
2015-12-23improved emoji picker styleValery Sizov
2015-12-23Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0Robert Speicher
2015-12-23TYPO in the commentValery Sizov
2015-12-23customize niceScrollValery Sizov
2015-12-23add some spinachValery Sizov
2015-12-23fix specsValery Sizov
2015-12-23emoji picker: minor fixesValery Sizov
2015-12-23emoji css refactoringValery Sizov
2015-12-23base implementation of emoji picker [ci skip]Valery Sizov