Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jej-pages-to-ce' into 'master' | Douwe Maan | 2017-02-06 | 19 | -17/+688 |
|\ | |||||
| * | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce | James Edwards-Jones | 2017-02-06 | 113 | -933/+2688 |
| |\ | |||||
| * \ | Merge branch 'master' into jej-pages-picked-from-ee | James Edwards-Jones | 2017-02-03 | 96 | -549/+1474 |
| |\ \ | |||||
| * | | | Fix GitLab Pages not refreshing upon new content | Stan Hu | 2017-02-01 | 1 | -0/+24 |
| * | | | Excluded pages_domains from import/export spec | James Edwards-Jones | 2017-02-01 | 1 | -0/+1 |
| * | | | Active tense test coverage in pages spec | Valery Sizov | 2017-02-01 | 1 | -3/+3 |
| * | | | Update validates_hostname to 1.0.6 to fix a bug in parsing hexadecimal-lookin... | Nick Thomas | 2017-02-01 | 1 | -1/+7 |
| * | | | Fixed Rubocop deprecation warnings | Yorick Peterse | 2017-02-01 | 1 | -3/+3 |
| * | | | Fix Rubocop offenses | Grzegorz Bizon | 2017-02-01 | 3 | -15/+15 |
| * | | | [CE->EE] Fix specs | Valery Sizov | 2017-02-01 | 1 | -1/+1 |
| * | | | Fix 500 error while navigating to the `pages_domains` 'show' page. | Timothy Andrew | 2017-01-31 | 2 | -7/+94 |
| * | | | Fix EE specs after ci_commit rename to pipeline | Kamil Trzcinski | 2017-01-31 | 1 | -3/+3 |
| * | | | Stub to enable it so that we could test this | Lin Jen-Shin | 2017-01-31 | 1 | -0/+2 |
| * | | | Add a test for checking pages setting | Lin Jen-Shin | 2017-01-31 | 1 | -0/+58 |
| * | | | Mock Dir::exist? in project_spec.rb | Kamil Trzcinski | 2017-01-31 | 1 | -2/+1 |
| * | | | Introduce pages_deployed? to Project model | Kamil Trzcinski | 2017-01-31 | 2 | -12/+23 |
| * | | | Describe #pages_url instead of :pages_url | Kamil Trzcinski | 2017-01-31 | 1 | -1/+1 |
| * | | | Fix the URL of group pages | Kamil Trzcinski | 2017-01-31 | 1 | -0/+33 |
| * | | | Update comments | Kamil Trzcinski | 2017-01-31 | 2 | -4/+6 |
| * | | | Verify trusted certificate chain | Kamil Trzcinski | 2017-01-31 | 2 | -5/+87 |
| * | | | Pages domain model specs | Kamil Trzcinski | 2017-01-31 | 4 | -0/+232 |
| * | | | Added support for zip archives in pages | Kamil Trzcinski | 2017-01-31 | 5 | -32/+42 |
| * | | | Move most of PagesWorker logic UpdatePagesService | Kamil Trzcinski | 2017-01-31 | 2 | -11/+16 |
| * | | | Asynchronously remove pages | Kamil Trzcinski | 2017-01-31 | 1 | -7/+14 |
| * | | | Rename pages namespace or project path when changed | Kamil Trzcinski | 2017-01-31 | 2 | -5/+8 |
| * | | | Fix specs | Kamil Trzcinski | 2017-01-31 | 1 | -0/+4 |
| * | | | Add GitLab Pages | Kamil Trzcinski | 2017-01-31 | 5 | -5/+110 |
* | | | | Merge branch 'traits-for-featurs' into 'master' | Robert Speicher | 2017-02-06 | 25 | -78/+62 |
|\ \ \ \ | |||||
| * | | | | Add traits for ProjectFeatures to Project factory | Semyon Pupkov | 2017-02-05 | 25 | -78/+62 |
* | | | | | Merge branch 'merge-request-environment-list-spec' into 'master' | Robert Speicher | 2017-02-06 | 1 | -15/+38 |
|\ \ \ \ \ | |||||
| * | | | | | Added specs for merge request environment listmerge-request-environment-list-spec | Phil Hughes | 2017-02-03 | 1 | -15/+38 |
* | | | | | | Merge branch '9-0-api-changes' into 'master' | Sean McGivern | 2017-02-06 | 4 | -35/+1995 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Remove deprecated MR and Issue endpoints and preserve V3 namespace9-0-api-changes | Oswaldo Ferreira | 2017-02-06 | 4 | -35/+1995 |
* | | | | | | Update system_note_service_spec.rb | Pedro Moreira da Silva | 2017-02-06 | 1 | -5/+5 |
|/ / / / / | |||||
* | | | | | Merge branch 'terminal-max-session-time' into 'master' | Kamil Trzciński | 2017-02-06 | 3 | -5/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-time | Adam Niedzielski | 2017-02-06 | 3 | -5/+20 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch '22007-unify-projects-search' into 'master' | Rémy Coutable | 2017-02-06 | 3 | -48/+1431 |
|\ \ \ \ \ | |||||
| * | | | | | Adjust V3 projects typo on spec22007-unify-projects-search | Oswaldo Ferreira | 2017-02-03 | 1 | -1/+1 |
| * | | | | | Remain V3 endpoint unchanged | Oswaldo Ferreira | 2017-01-30 | 2 | -2/+1431 |
| * | | | | | Unify projects search by removing /projects/:search endpoint | Oswaldo Ferreira | 2017-01-30 | 1 | -46/+0 |
* | | | | | | Merge branch 'api-fix-files' into 'master' | Rémy Coutable | 2017-02-06 | 2 | -0/+6 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Ensure the right content is served for the build artifacts APIapi-fix-files | Robert Schilling | 2017-02-05 | 2 | -0/+6 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-02-03 | 10 | -36/+58 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'fix-scroll-test' into 'master' | Alfredo Sumaran | 2017-02-03 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Change window size before visiting page, to get correct scroll positionfix-scroll-test | Filipa Lacerda | 2017-02-03 | 1 | -1/+1 |
| * | | | | | | Merge branch 'fix-slash-commands-spec-error' into 'master' | Filipa Lacerda | 2017-02-03 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fix slash commands spec errorfix-slash-commands-spec-error | Clement Ho | 2017-02-03 | 1 | -0/+2 |
| * | | | | | | Merge branch 'git_to_html_redirection' into 'master' | Sean McGivern | 2017-02-03 | 1 | -0/+11 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Fixed redirection from http://someproject.git to http://someproject | blackst0ne | 2017-02-04 | 1 | -0/+11 |
| * | | | | | | Merge branch 'rs-event-traits' into 'master' | Rémy Coutable | 2017-02-03 | 7 | -35/+44 |
| |\ \ \ \ \ \ |