summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename snippets scopes to plural names.Marin Jankovski2014-06-044-17/+17
* Update mysql2 gem.Marin Jankovski2014-06-031-1/+1
* Update jasmine.Marin Jankovski2014-06-032-5/+5
* Fix the system_hook test.Marin Jankovski2014-06-031-1/+1
* Add acts-as-taggable-on-patch for gem version 2.4.1 and Rails 4.1.Marin Jankovski2014-06-031-0/+130
* Remove active_record.auto_explain_treshold_in_seconds, rails 4.0 deprecationMarin Jankovski2014-06-031-4/+0
* Convert to array since Relation no longer returns an array.Marin Jankovski2014-06-031-1/+1
* Fix failing submodule test.Marin Jankovski2014-06-031-1/+2
* Add a state_machine patch for rails 4.1.Marin Jankovski2014-06-031-0/+9
* Replace snippets scopes in view and controller.Marin Jankovski2014-06-032-11/+11
* Replace now forbidden keywords public and private for snippets scopeMarin Jankovski2014-06-032-3/+3
* Bump to Rails 4.1.Marin Jankovski2014-06-032-48/+53
* Merge pull request #7062 from williamherry/fix_add_smtp_settings_to_gitignoreMarin Jankovski2014-06-031-0/+1
|\
| * add smtp_settings.rb to gitignore fileWilliam Herry2014-06-031-0/+1
* | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2014-06-036-16/+15
|\ \
| * | Use big colorful pills for switch between MR tabsDmitriy Zaporozhets2014-06-032-10/+6
| * | Improve small panelsDmitriy Zaporozhets2014-06-031-0/+4
| * | Use padding like most of other bootstrap elementsDmitriy Zaporozhets2014-06-034-6/+5
|/ /
* | Merge pull request #6943 from jvanbaarsen/spec-fixDmitriy Zaporozhets2014-06-034-31/+30
|\ \
| * | Put back the travis informationJeroen van Baarsen2014-05-301-0/+3
| * | Fix for failing specsJeroen van Baarsen2014-05-305-34/+30
* | | Merge branch 'performance-improvements' into 'master'Dmitriy Zaporozhets2014-06-025-11/+33
|\ \ \ | |_|/ |/| |
| * | Get group members only if group not nilDmitriy Zaporozhets2014-06-021-1/+4
| * | Add members paginations to admin/project pageDmitriy Zaporozhets2014-06-022-2/+8
| * | Improve admin group page performanceDmitriy Zaporozhets2014-06-023-9/+22
|/ /
* | Merge branch 'developers-protected-branches' into 'master'Dmitriy Zaporozhets2014-06-022-8/+19
|\ \
| * | Dont show new file link on protected branch for developersDmitriy Zaporozhets2014-06-022-8/+19
|/ /
* | Merge branch 'profile-personal-projects' into 'master'Dmitriy Zaporozhets2014-06-026-21/+28
|\ \
| * | Fix tests for user pageDmitriy Zaporozhets2014-06-024-18/+22
| * | Show only personal projects on profile pageDmitriy Zaporozhets2014-05-303-3/+6
| |/
* | Merge branch 'ui-colors' into 'master'Dmitriy Zaporozhets2014-06-028-12/+16
|\ \
| * | Use link_color var more oftenDmitriy Zaporozhets2014-06-023-3/+3
| * | Fix syntax errorDmitriy Zaporozhets2014-06-024-5/+5
| * | Refactor scss variables. Use darker color for linksDmitriy Zaporozhets2014-06-026-9/+13
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-06-022-4/+0
|\ \ \
| * \ \ Merge pull request #7053 from jvanbaarsen/removed_support_emailDmitriy Zaporozhets2014-06-012-4/+0
| |\ \ \ | | |/ / | |/| |
| | * | Removed the Support Email settingJeroen van Baarsen2014-05-302-4/+0
| | |/
* | | Merge branch 'add_noreferrer_to_all_links' into 'master'Dmitriy Zaporozhets2014-06-022-0/+50
|\ \ \
| * | | Add nofollow to all internal links.Marin Jankovski2014-05-302-7/+43
| * | | Extend default link_to helper to add noreferrer html_option.Marin Jankovski2014-05-291-0/+14
* | | | Merge branch 'updater_location' into 'master'Dmitriy Zaporozhets2014-06-021-3/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Update the one-liner.Marin Jankovski2014-06-021-1/+3
| * | | Add bash one liner in updater doc due to change of updater location.Marin Jankovski2014-06-021-2/+3
|/ / /
* | | Merge branch 'bump-gitlab-shell' into 'master'Dmitriy Zaporozhets2014-05-312-2/+2
|\ \ \
| * | | Bump gitlab-shell versionDmitriy Zaporozhets2014-05-312-2/+2
|/ / /
* | | New colors for success/warning/primaryDmitriy Zaporozhets2014-05-312-14/+8
* | | Use same color vars for primary/warning stylesDmitriy Zaporozhets2014-05-311-6/+6
* | | Different UI colors for archive project and remove projectDmitriy Zaporozhets2014-05-312-21/+37
* | | Small ui improvementsDmitriy Zaporozhets2014-05-312-2/+18
* | | Simplify issue-box styleDmitriy Zaporozhets2014-05-314-38/+23