summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Upgrade Docker build to v7.10.0Stan Hu2015-04-271-1/+1
* 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
| |\
| | * 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
| | * 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.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.forked-eventDouwe Maan2015-04-246-69/+42
| * | | | Merge branch 'rs-minor-styles' into 'master'Dmitriy Zaporozhets2015-04-2718-125/+133
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Place the logo's tooltip dynamicallyrs-minor-stylesRobert Speicher2015-04-252-1/+9
| | * | | 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
| | * | | Fix Profile > Design live-updatingRobert Speicher2015-04-252-15/+26
| | * | | Items with tooltips don't need a 'data-original-title' attributeRobert Speicher2015-04-251-22/+21
| | * | | Don't override color of code blocks in notesRobert Speicher2015-04-251-1/+0
| | * | | Simplify icon style selectorsRobert Speicher2015-04-252-2/+2
| | | |/ | | |/|
| * | | 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
| * | | Merge branch 'rs-refactor-reference-extractor' into 'master'Robert Speicher2015-04-2521-257/+464
| |\ \ \ | | |/ / | |/| |
| | * | 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
| | * | CommitRange improvementsRobert Speicher2015-04-252-16/+13
| | * | Update CommitRangeReferenceFilter to use CommitRange classRobert Speicher2015-04-252-37/+20
| | * | Add CommitRange classRobert Speicher2015-04-252-0/+283
| | * | Always use short SHAs as commit reference link textRobert Speicher2015-04-252-5/+15
| | * | Add to_param to mentionable spec's mockRobert Speicher2015-04-251-1/+1
| | * | Refactor ReferenceExtractor to use pipeline filtersRobert Speicher2015-04-252-193/+36
| | * | Add results to reference filtersRobert Speicher2015-04-2514-18/+129
| | * | Add `pipeline_result` to ReferenceFilterSpecHelperRobert Speicher2015-04-251-0/+14
| | * | Initialize the references result Hash in ReferenceFilterRobert Speicher2015-04-251-0/+16
| |/ /
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-2717-32/+68
|\ \ \
| * \ \ Merge pull request #8644 from Bugagazavr/hook-eventsDmitriy Zaporozhets2015-04-2710-21/+32
| |\ \ \
| | * | | Added X-GitLab-Event header for web hooksbugagazavr2015-04-2510-21/+32
| * | | | Merge pull request #9186 from Senorsen/patch-1Dmitriy Zaporozhets2015-04-271-1/+1
| |\ \ \ \