summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-04-274-6/+14
|\
| * Merge branch 'fix-relative-submodule-links-with-personal-projects' into 'master'Dmitriy Zaporozhets2015-04-273-5/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken file browsing with relative submodule in personal projects Git submodules with relative links work fine for projects in groups but not in personal projects. This patch fixes this issue. To reproduce the problem, go here: https://gitlab.com/andrewwu.tw/submodule-test/tree/master Closes https://github.com/gitlabhq/gitlabhq/issues/7554 See merge request !565
| | * Fix broken file browsing with relative submodule in personal projectsStan Hu2015-04-233-6/+13
| | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/7554
| * | Merge branch 'upgrade-dockerfile-7.10.0' into 'master'Robert Schilling2015-04-271-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | Upgrade Docker build to v7.10.0 See merge request !568
| | * | Upgrade Docker build to v7.10.0Stan Hu2015-04-271-1/+1
| | | |
* | | | Merge branch 'docker-improvements' into 'master'Sytse Sijbrandij2015-04-281-9/+35
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Add more instructions on how to publish docker images yourself. See merge request !1800
| * | | Add more instuctions on how to publish docker images yourself.Sytse Sijbrandij2015-04-271-9/+35
|/ / /
* | | Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-2710-32/+21
| | | | | | | | | | | | This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.
* | | Merge pull request #9209 from Soullivaneuh/bootstrap-updateJeroen van Baarsen2015-04-271-3/+3
|\ \ \ | | | | | | | | Bootstrap 3.3.4
| * | | Bootstrap 3.3.4Sullivan SENECHAL2015-04-271-3/+3
| | | |
* | | | Merge pull request #9208 from Soullivaneuh/container-classJeroen van Baarsen2015-04-271-2/+2
|\ \ \ \ | | | | | | | | | | Fix .container position on navbar
| * | | | Fix '.container or .container-fluid should be the first child inside of a ↵Sullivan SENECHAL2015-04-261-2/+2
| |/ / / | | | | | | | | | | | | .navbar' issue
* | | | Merge pull request #9207 from Soullivaneuh/x-ua-compatibleJeroen van Baarsen2015-04-271-0/+1
|\ \ \ \ | |_|/ / |/| | | Fix missing X-UA-Compatible meta tag
| * | | Fix "`<head>` is missing X-UA-Compatible `<meta>` tag that disables old IE ↵Sullivan SENECHAL2015-04-261-0/+1
| |/ / | | | | | | | | | compatibility modes"
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-2755-518/+743
|\ \ \
| * \ \ Merge branch 'rs-capybara-screenshot' into 'master'Dmitriy Zaporozhets2015-04-277-37/+67
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add capybara-screenshot gem This is a handy little gem that automatically saves the page and a screenshot when a Capybara test fails to `tmp/capybara/` so you can easily see why it might have failed without adding your own `save_and_open_page` directive in the code. Also reduces the timeout for Capybara tests when not in a CI environment. See merge request !578
| | * | | Don't use capybara-screenshot in CI environmentsrs-capybara-screenshotRobert Speicher2015-04-252-6/+10
| | | | |
| | * | | Enable js_errors for Capybara in Spinach and RSpecRobert Speicher2015-04-252-2/+2
| | | | |
| | * | | Move RSpec setup for Capybara to its own support fileRobert Speicher2015-04-252-7/+20
| | | | |
| | * | | Reduce timeout for non-CI featuresRobert Speicher2015-04-251-2/+5
| | | | |
| | * | | Move Spinach setup for db_cleaner and capybara to their own filesRobert Speicher2015-04-253-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | | Also adds capybara-screenshot, which will automatically save the page as html and an image whenever a feature fails. Handy for debugging.
| | * | | Add capybara-screenshot gemRobert Speicher2015-04-252-4/+6
| | | | |
| * | | | Merge branch 'fix-gitorious-importer' into 'master'Dmitriy Zaporozhets2015-04-273-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get Gitorious importer to work again. Fixes #1504. See merge request !576
| | * | | | Get Gitorious importer to work again.fix-gitorious-importerDouwe Maan2015-04-243-2/+3
| | | | | |
| * | | | | Merge branch 'forked-event' into 'master'Dmitriy Zaporozhets2015-04-276-69/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Projects::CreateService to fork projects so that after-create hooks are run. Makes for cleaner code and less duplication, and causes the "User created project Namespace / Project" event to be posted and system hooks to be run. See merge request !575
| | * | | | | Use Projects::CreateService to fork projects so that after-create hooks are run.forked-eventDouwe Maan2015-04-246-69/+42
| | | | | | |
| * | | | | | Merge branch 'rs-minor-styles' into 'master'Dmitriy Zaporozhets2015-04-2718-125/+133
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor design change grab-bag :tada: I started with one simple change and found a few more, so here they are. ### Simplify icon style selectors All FontAwesome icons have an `fa` class, so just use that. ### Don't override color of code blocks in notes This was a pet peeve of mine. | Before | After | |:------:|:-----:| | ![Screen_Shot_2015-04-23_at_4.14.23_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c77cb0816bf0f05cb8c4105cdd8b3ec6/Screen_Shot_2015-04-23_at_4.14.23_PM.png) | ![Screen_Shot_2015-04-23_at_4.15.44_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/463c1d2052e12444563f5e2c102ac51e/Screen_Shot_2015-04-23_at_4.15.44_PM.png) | ### Items with tooltips don't need a 'data-original-title' attribute This attribute gets added dynamically by Bootstrap's tooltip JS based on the `title` attribute ### Fix Profile > Design live-updating `ui_blue` wasn't added to the list of classes to remove, so if a user changed to that theme, any subsequent changes wouldn't be live-updated. This change refactors Gitlab::Theme a bit to make it harder for this to happen in the future with new themes. ### Remove the `has_bottom_tooltip` class Bootstrap's tooltip JS can read the placement from a `data-placement` attribute. Further, when we supply the `selector` option to `tooltip`, tooltips will be added to any dynamically-added elements matching the selector, without us having to re-call the `tooltip` method. See merge request !569
| | * | | | | Place the logo's tooltip dynamicallyrs-minor-stylesRobert Speicher2015-04-252-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When collapsed it's on the right like everything else, when expanded it's on the bottom.
| | * | | | | Add data-placement attributes for all sidebar linksRobert Speicher2015-04-259-70/+70
| | | | | | |
| | * | | | | Add collapsed navbar links to the default tooltip selectorRobert Speicher2015-04-252-5/+1
| | | | | | |
| | * | | | | Fix "Dashboard > New project" featureRobert Speicher2015-04-251-1/+3
| | | | | | |
| | * | | | | There's no longer a reason to re-render the header on Design updatesRobert Speicher2015-04-251-3/+0
| | | | | | |
| | * | | | | Remove the `has_bottom_tooltip` classRobert Speicher2015-04-253-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bootstrap's tooltip JS can read the placement from a `data-placement` attribute. Further, when we supply the `selector` option to `tooltip`, tooltips will be added to any dynamically-added elements matching the selector, without us having to re-call the `tooltip` method.
| | * | | | | Fix Profile > Design live-updatingRobert Speicher2015-04-252-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ui_blue` wasn't added to the list of classes to remove, so if a user changed to that theme, any subsequent changes wouldn't be live-updated. This change refactors Gitlab::Theme a bit to make it harder for this to happen in the future with new themes.
| | * | | | | Items with tooltips don't need a 'data-original-title' attributeRobert Speicher2015-04-251-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bootstrap's tooltip JS just uses the `title` attribute.
| | * | | | | Don't override color of code blocks in notesRobert Speicher2015-04-251-1/+0
| | | | | | |
| | * | | | | Simplify icon style selectorsRobert Speicher2015-04-252-2/+2
| | | |/ / / | | |/| | | | | | | | | | | | | | | All FontAwesome icons have an `fa` class, so just use that.
| * | | | | Convert UserReferenceFilter#link_to_group to use a guard clauseRobert Speicher2015-04-251-7/+5
| | | | | |
| * | | | | Refactor `UserReferenceFilter#user_link_filter`Robert Speicher2015-04-251-35/+43
| | | | | |
| * | | | | Fix docs for `push_result`Robert Speicher2015-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Merge branch 'rs-refactor-reference-extractor' into 'master'Robert Speicher2015-04-2521-257/+464
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Refactor ReferenceExtractor See merge request !557
| | * | | | Fix NotificationService specRobert Speicher2015-04-253-7/+7
| | | | | |
| | * | | | Rename `CommitRange#sha_from_as_param` to `#suffixed_sha_from`rs-refactor-reference-extractorRobert Speicher2015-04-251-4/+4
| | | | | |
| | * | | | Rename `CommitRange#inclusive?` to `#exclude_start?`Robert Speicher2015-04-252-17/+15
| | | | | |
| | * | | | Add CommitRange directly to results HashRobert Speicher2015-04-252-5/+5
| | | | | |
| | * | | | Remove CommitRange#to_aRobert Speicher2015-04-252-40/+0
| | | | | |
| | * | | | DRY up ReferenceExtractorRobert Speicher2015-04-251-9/+11
| | | | | |
| | * | | | Don't allow nil references to get added to resultsRobert Speicher2015-04-251-0/+2
| | | | | |
| | * | | | Include caret in CommitRange#reference_titleRobert Speicher2015-04-252-2/+6
| | | | | |
| | * | | | Remove param from CommitRange#to_sRobert Speicher2015-04-252-22/+6
| | | | | |