Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Remove js handler from Profiles#update | Robert Speicher | 2015-06-16 | 1 | -1/+0 | |
| * | | Move the "Design" templates and logic to Preferences | Robert Speicher | 2015-06-16 | 11 | -105/+112 | |
| * | | Add Profiles::PreferencesController | Robert Speicher | 2015-06-16 | 11 | -15/+127 | |
* | | | Merge branch 'bump-gems' into '7-12-stable' | Dmitriy Zaporozhets | 2015-06-17 | 2 | -34/+37 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Merge branch 'rs-rails-update' into 'master'bump-gems | Dmitriy Zaporozhets | 2015-06-17 | 2 | -34/+37 | |
|/ / | ||||||
* | | Version 7.12.0.rc2v7.12.0.rc2 | Jacob Vosmaer | 2015-06-16 | 1 | -1/+1 | |
* | | Merge branch 'kerberos_require' into '7-12-stable' | Dmitriy Zaporozhets | 2015-06-16 | 1 | -0/+8 | |
|\ \ | ||||||
| * | | Merge branch 'require_kerberos_when_enabled' into 'master'kerberos_require | Dmitriy Zaporozhets | 2015-06-16 | 1 | -0/+8 | |
* | | | Merge branch '7-12-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-12-stable | Dmitriy Zaporozhets | 2015-06-16 | 4 | -36/+52 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch '7-12-rc2' into '7-12-stable' | Dmitriy Zaporozhets | 2015-06-15 | 5 | -38/+57 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Fix .gitlab-ci.yml file | Dmitriy Zaporozhets | 2015-06-15 | 1 | -25/+37 | |
| | * | Fix typo on account page. | Nicolas | 2015-06-15 | 1 | -1/+1 | |
| | * | Merge branch 'fix-gitlab-ci-yml' into 'master' | Dmitriy Zaporozhets | 2015-06-15 | 3 | -12/+19 | |
| |/ | ||||||
* | | Dont set checkout sha for removed branch/tag | Dmitriy Zaporozhets | 2015-06-15 | 1 | -2/+5 | |
|/ | ||||||
* | Version 7.12.0.rc1v7.12.0.rc1 | Jacob Vosmaer | 2015-06-12 | 1 | -1/+1 | |
* | Merge branch 'update-install-docs' into 'master' | Marin Jankovski | 2015-06-12 | 1 | -4/+4 | |
|\ | ||||||
| * | New source installs should use 7-12-stable | Jacob Vosmaer | 2015-06-12 | 1 | -2/+2 | |
| * | Install git 2.4.3 | Jacob Vosmaer | 2015-06-12 | 1 | -2/+2 | |
|/ | ||||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-06-12 | 70 | -831/+831 | |
|\ | ||||||
| * | Merge branch 'rs-expect-syntax-features' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 70 | -831/+831 | |
| |\ | ||||||
| | * | Call `page.all` instead of `all` in feature steps | Robert Speicher | 2015-06-12 | 10 | -12/+12 | |
| | * | Change `within` to `page.within` in feature steps | Robert Speicher | 2015-06-12 | 34 | -159/+159 | |
| | * | Update all `should`-style syntax to `expect` in features | Robert Speicher | 2015-06-12 | 69 | -662/+662 | |
| |/ | ||||||
* | | Merge branch 'remove-activity-feed-text' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 3 | -3/+0 | |
|\ \ | ||||||
| * | | Remove text since rss is now to prominent. | Sytse Sijbrandij | 2015-06-12 | 3 | -3/+0 | |
* | | | Merge branch 'rc1-release-doc-link' into 'master' | Job van der Voort | 2015-06-12 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Fix link to howto_rc1.md | Jacob Vosmaer | 2015-06-12 | 1 | -1/+1 | |
|/ / | ||||||
* | | 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 | |
| |\ \ \ \ |