Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update all `should`-style syntax to `expect` in features | Robert Speicher | 2015-06-12 | 69 | -662/+662 |
* | Merge branch 'note_about_omnibus_changes' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 8 | -4/+31 |
|\ | |||||
| * | Add a note that changing example configuration files requires changing omnibu...note_about_omnibus_changes | Marin Jankovski | 2015-06-11 | 8 | -4/+31 |
* | | Merge branch 'refactor-mr-widget' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 28 | -299/+306 |
|\ \ | |||||
| * | | Fix test for accept merge request | Dmitriy Zaporozhets | 2015-06-12 | 1 | -0/+1 |
| * | | Fix merge request testrefactor-mr-widget | Dmitriy Zaporozhets | 2015-06-11 | 1 | -1/+1 |
| * | | Fix automerge | Dmitriy Zaporozhets | 2015-06-11 | 2 | -5/+4 |
| * | | Improve variables in mr widget | Dmitriy Zaporozhets | 2015-06-11 | 5 | -15/+8 |
| * | | Fix rubocop | Dmitriy Zaporozhets | 2015-06-11 | 1 | -2/+1 |
| * | | Extract merge request widget JS to separate class | Dmitriy Zaporozhets | 2015-06-11 | 11 | -87/+96 |
| * | | Refactor merge request widget step 2 | Dmitriy Zaporozhets | 2015-06-11 | 17 | -75/+60 |
| * | | Refactor accept merge request widget | Dmitriy Zaporozhets | 2015-06-11 | 23 | -191/+212 |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-06-12 | 4 | -5/+11 |
|\ \ \ | |||||
| * \ \ | Merge branch 'fix-graph-width' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Fix graph width on different screen sizesfix-graph-width | Dmitriy Zaporozhets | 2015-06-11 | 1 | -2/+2 |
| | |/ / | |||||
| * | | | Merge branch 'fluid-commit-calendar' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | Make commit calendar size depend on window sizefluid-commit-calendar | Dmitriy Zaporozhets | 2015-06-11 | 1 | -0/+1 |
| | |/ / | |||||
| * | | | Merge branch 'rs-issue-1757' into 'master' | Dmitriy Zaporozhets | 2015-06-11 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Add negative tabindex to Markdown Write and Preview tabsrs-issue-1757 | Robert Speicher | 2015-06-10 | 1 | -2/+2 |
| | |/ / | |||||
| * | | | Self build images require different build commands. | Sytse Sijbrandij | 2015-06-11 | 1 | -1/+6 |
* | | | | Merge pull request #9371 from zenati/patch-2 | Dmitriy Zaporozhets | 2015-06-11 | 6 | -9/+11 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | An `in_namespace` scope is already present | zenati | 2015-06-09 | 6 | -9/+11 |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Sytse Sijbrandij | 2015-06-11 | 2 | -9/+10 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'rs-issue-1758' into 'master' | Dmitriy Zaporozhets | 2015-06-11 | 2 | -9/+10 |
| |\ \ \ \ | |||||
| | * | | | | Fix "Acount" typo in 2FA docsrs-issue-1758 | Robert Speicher | 2015-06-10 | 1 | -3/+3 |
| | * | | | | Update grids for 2FA details | Robert Speicher | 2015-06-10 | 1 | -6/+7 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Sytse Sijbrandij | 2015-06-11 | 1 | -5/+5 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #9382 from stefan-it/stefan/docker-documentation-fx | Sytse Sijbrandij | 2015-06-11 | 1 | -5/+5 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | [Docker][Documentation] Uses new docker data image from Docker Hub (*sytse/gi... | Stefan Schweter | 2015-06-11 | 1 | -5/+5 |
| |/ / / / | |||||
* | | | | | Merge branch 'info_about_namespaces' into 'master' | Job van der Voort | 2015-06-11 | 1 | -178/+192 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | added links to API calls | Karen Carias | 2015-06-10 | 1 | -191/+191 |
| * | | | | fixed namespaces info | Karen Carias | 2015-05-28 | 1 | -3/+3 |
| * | | | | added info about namespaces | Karen Carias | 2015-05-28 | 1 | -0/+14 |
* | | | | | Merge branch 'fix-importing-docs' into 'master' | Job van der Voort | 2015-06-11 | 8 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | fix and minify images | Job van der Voort | 2015-06-11 | 8 | -4/+4 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Job van der Voort | 2015-06-11 | 3 | -0/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'update-oauth-button-logos' into 'master' | Sytse Sijbrandij | 2015-06-11 | 3 | -0/+1 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Update oauth button logos for Twitter and Google | Max Borghino | 2015-06-10 | 3 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'fix-importing-docs' into 'master' | Job van der Voort | 2015-06-11 | 13 | -4/+4 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | move and fix links importing docs | Job van der Voort | 2015-06-11 | 13 | -4/+4 |
|/ / / / | |||||
* | | | | Merge branch 'project_settings_icons_alignment' into 'master' | Douwe Maan | 2015-06-10 | 1 | -5/+5 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix alignment of Project Settings nav icons. | Nicolas | 2015-06-10 | 1 | -5/+5 |
* | | | | Merge branch 'fix-project-edit' into 'master' | Dmitriy Zaporozhets | 2015-06-10 | 1 | -17/+25 |
|\ \ \ \ | |||||
| * | | | | Improve project edit form | Dmitriy Zaporozhets | 2015-06-10 | 1 | -17/+25 |
|/ / / / | |||||
* | | | | Merge branch 'rs-pre-rspec-3' into 'master' | Dmitriy Zaporozhets | 2015-06-10 | 20 | -56/+50 |
|\ \ \ \ | |||||
| * | | | | Fix taskable requirers-pre-rspec-3 | Robert Speicher | 2015-06-10 | 1 | -0/+1 |
| * | | | | Fix shoulda-matchers require | Robert Speicher | 2015-06-10 | 2 | -1/+2 |
| * | | | | Use stub_const to stub constants instead of redefining them | Robert Speicher | 2015-06-10 | 1 | -2/+1 |
| * | | | | Memoize result of JSON.parse in json_response | Robert Speicher | 2015-06-10 | 1 | -1/+1 |
| * | | | | Add `respond_to_missing?` for Commit and Repository | Robert Speicher | 2015-06-10 | 2 | -8/+4 |