Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Document that we don't want pushed commits to be rebased and give a rationale...small-contributions-no-rebase | Sytse Sijbrandij | 2014-06-04 | 1 | -2/+3 |
* | Merge branch 'update/patch_doc' into 'master' | Sytse Sijbrandij | 2014-06-04 | 1 | -4/+4 |
|\ | |||||
| * | Update patch release document. | Marin Jankovski | 2014-06-04 | 1 | -4/+4 |
* | | Merge branch 'upgrade_to_rails_4.1' into 'master' | Dmitriy Zaporozhets | 2014-06-04 | 11 | -75/+216 |
|\ \ | |/ |/| | |||||
| * | Rename snippets scopes to plural names. | Marin Jankovski | 2014-06-04 | 4 | -17/+17 |
| * | Update mysql2 gem. | Marin Jankovski | 2014-06-03 | 1 | -1/+1 |
| * | Update jasmine. | Marin Jankovski | 2014-06-03 | 2 | -5/+5 |
| * | Fix the system_hook test. | Marin Jankovski | 2014-06-03 | 1 | -1/+1 |
| * | Add acts-as-taggable-on-patch for gem version 2.4.1 and Rails 4.1. | Marin Jankovski | 2014-06-03 | 1 | -0/+130 |
| * | Remove active_record.auto_explain_treshold_in_seconds, rails 4.0 deprecation | Marin Jankovski | 2014-06-03 | 1 | -4/+0 |
| * | Convert to array since Relation no longer returns an array. | Marin Jankovski | 2014-06-03 | 1 | -1/+1 |
| * | Fix failing submodule test. | Marin Jankovski | 2014-06-03 | 1 | -1/+2 |
| * | Add a state_machine patch for rails 4.1. | Marin Jankovski | 2014-06-03 | 1 | -0/+9 |
| * | Replace snippets scopes in view and controller. | Marin Jankovski | 2014-06-03 | 2 | -11/+11 |
| * | Replace now forbidden keywords public and private for snippets scope | Marin Jankovski | 2014-06-03 | 2 | -3/+3 |
| * | Bump to Rails 4.1. | Marin Jankovski | 2014-06-03 | 2 | -48/+53 |
* | | Merge pull request #7067 from cirosantilli/doc-md-style | Sytse Sijbrandij | 2014-06-04 | 88 | -1414/+1352 |
|\ \ | |||||
| * | | Update docs to markdown style guide. | Ciro Santilli | 2014-06-03 | 88 | -1414/+1352 |
|/ / | |||||
* | | Add some entries to changelog | Dmitriy Zaporozhets | 2014-06-03 | 1 | -0/+2 |
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-06-03 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #7068 from chino/only-check-ci-status-when-ci-service-enabled | Dmitriy Zaporozhets | 2014-06-03 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | project: ci_service should only catch ci services | Daniel Aquino | 2014-06-03 | 1 | -1/+1 |
* | | | | Small spelling correction in the readme. | Sytse Sijbrandij | 2014-06-03 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'chrome-app' into 'master' | Sytse Sijbrandij | 2014-06-03 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Add chrome app of Go Sueyoshi. | Sytse Sijbrandij | 2014-06-03 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'same-origin-header' into 'master' | Dmitriy Zaporozhets | 2014-06-03 | 2 | -0/+2 |
|\ \ \ | |||||
| * | | | Ensure sidekiq is displayed by setting X-Frame-Options. | GitLab | 2014-06-03 | 2 | -0/+2 |
| * | | | Revert "Set x-frame-option to sameorigin to allow the Sidekiq iframe to displ... | GitLab | 2014-06-03 | 2 | -2/+1 |
| * | | | Set x-frame-option to sameorigin to allow the Sidekiq iframe to display. | GitLab | 2014-06-03 | 2 | -1/+2 |
* | | | | Merge branch 'case-insensetive-search' into 'master' | Dmitriy Zaporozhets | 2014-06-03 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Case-insensetive search for issue/mr title | Dmitriy Zaporozhets | 2014-06-03 | 1 | -1/+1 |
* | | | | | Merge branch 'ui-improvements' into 'master' | Dmitriy Zaporozhets | 2014-06-03 | 1 | -7/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Improve green theme | Dmitriy Zaporozhets | 2014-06-03 | 1 | -7/+7 |
| |/ / / / | |||||
* | | | | | Show events from all projects on user page | Dmitriy Zaporozhets | 2014-06-03 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | Merge branch 'remove_artifact' into 'master' | Dmitriy Zaporozhets | 2014-06-03 | 2 | -2/+1 |
|\ \ \ \ | |||||
| * | | | | Add ch width. | Marin Jankovski | 2014-06-03 | 2 | -1/+1 |
| * | | | | Do not show a 72 times. | Marin Jankovski | 2014-06-03 | 1 | -1/+0 |
* | | | | | Merge branch 'ui-improvements' into 'master' | Dmitriy Zaporozhets | 2014-06-03 | 4 | -61/+64 |
|\ \ \ \ \ | |||||
| * | | | | | Improve UI/UX for create/edit group in admin area | Dmitriy Zaporozhets | 2014-06-03 | 4 | -61/+64 |
|/ / / / / | |||||
* | | | | | Use same colors for disabled buttons | Dmitriy Zaporozhets | 2014-06-03 | 1 | -8/+0 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'ui-improvements' into 'master' | Dmitriy Zaporozhets | 2014-06-03 | 7 | -30/+42 |
|\ \ \ \ | |||||
| * | | | | Remove color-named css classes | Dmitriy Zaporozhets | 2014-06-03 | 7 | -30/+42 |
* | | | | | New base colors | Dmitriy Zaporozhets | 2014-06-03 | 1 | -4/+4 |
* | | | | | Merge branch 'ui-improvements' into 'master' | Dmitriy Zaporozhets | 2014-06-03 | 25 | -171/+245 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Improve admin/projects page | Dmitriy Zaporozhets | 2014-06-03 | 3 | -29/+39 |
| * | | | | Change page-title font/color | Dmitriy Zaporozhets | 2014-06-03 | 2 | -3/+4 |
| * | | | | Replace files icons with fontawesome | Dmitriy Zaporozhets | 2014-06-03 | 12 | -5/+13 |
| * | | | | Improve admin/user form | Dmitriy Zaporozhets | 2014-06-03 | 4 | -13/+14 |
| * | | | | Restyle admin/user page | Dmitriy Zaporozhets | 2014-06-03 | 4 | -121/+175 |
* | | | | | Merge branch 'revert-img-paste' into 'master' | Dmitriy Zaporozhets | 2014-06-03 | 9 | -126/+25 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | |