summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rubocop: Style/Alias enabledDmitriy Zaporozhets2015-02-022-2/+2
* Rubocop: Style/AccessorMethodName enabledDmitriy Zaporozhets2015-02-022-3/+3
* Rubocop enabled for: Use spaces inside hash literal bracesDmitriy Zaporozhets2015-02-0227-66/+66
* Add rubocop to rake test and rake test_ciDmitriy Zaporozhets2015-02-023-1/+4
* Fix syntax errorDmitriy Zaporozhets2015-02-021-5/+7
* Update CHANGELOG with rubocopDmitriy Zaporozhets2015-02-021-1/+1
* Convert hashes to ruby 1.9 styleDmitriy Zaporozhets2015-02-0212-31/+27
* Merge branch 'rubocop' into 'master'Dmitriy Zaporozhets2015-02-033-18/+1023
|\
| * At first disable all checks. We will enable it one by one laterDmitriy Zaporozhets2015-02-021-8/+988
| * Add rubocop and remove rails_best_practices gemDmitriy Zaporozhets2015-02-023-18/+43
|/
* Merge branch 'improve-dash-icons' into 'master'Dmitriy Zaporozhets2015-02-035-7/+18
|\
| * Improve project icons for dashboardDmitriy Zaporozhets2015-02-025-7/+18
* | Merge branch 'doc/import' into 'master'Job van der Voort2015-02-031-4/+11
|\ \ | |/ |/|
| * Separate out the instructions for source installsJacob Vosmaer2015-01-261-4/+6
| * Make omnibus the default in repo import docsJacob Vosmaer2015-01-211-4/+9
* | Annotate modelsDmitriy Zaporozhets2015-02-029-2/+87
* | Merge branch 'search-group' into 'master'Marin Jankovski2015-02-021-1/+21
|\ \
| * | add clear documentation on searching between groupsJob van der Voort2015-02-021-1/+21
* | | Merge pull request #8693 from tsigo/masterDmitriy Zaporozhets2015-02-021-5/+1
|\ \ \
| * | | Fix RepositoryCache backend attr_readerRobert Speicher2015-01-301-5/+1
* | | | Merge pull request #8698 from tsigo/rs-spec-directoriesDmitriy Zaporozhets2015-02-0215-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Make the structure of spec/models match app/modelsRobert Speicher2015-01-3015-0/+0
| |/ /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-02-021-1/+1
|\ \ \
| * \ \ Merge branch 'master' into 'master'Robert Schilling2015-01-301-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Bump GitLab for Docker to version 7.7.2Vincent Robert2015-01-301-1/+1
| |/ /
* | | Merge branch 'update-needs-libkrb5-dev' into 'master'Valery Sizov2015-01-301-0/+3
|\ \ \ | |/ / |/| |
| * | Mention libkrb5-dev dependencyJacob Vosmaer2015-01-301-0/+3
|/ /
* | Fix specs for iconsDmitriy Zaporozhets2015-01-301-0/+3
* | Set right test as trickyDmitriy Zaporozhets2015-01-291-2/+2
* | Fix semaphore spinach tagsDmitriy Zaporozhets2015-01-291-2/+2
* | Skip tricky test for semaphoreDmitriy Zaporozhets2015-01-292-2/+8
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-01-2913-53/+56
|\ \
| * \ Merge pull request #8670 from tsigo/rs-fa-icon-helperDmitriy Zaporozhets2015-01-299-41/+42
| |\ \
| | * | Use `icon` helper method in helper modulesRobert Speicher2015-01-287-27/+19
| | * | Move `spinner` helper into IconsHelperRobert Speicher2015-01-282-9/+9
| | * | Add `icon` helper methodRobert Speicher2015-01-281-5/+14
| * | | Merge pull request #8687 from tsigo/rs-pry-railsDmitriy Zaporozhets2015-01-292-2/+4
| |\ \ \
| | * | | Use pry-rails gem instead of pryRobert Speicher2015-01-292-2/+4
| * | | | Merge pull request #8688 from tsigo/rs-clean-spec-outputDmitriy Zaporozhets2015-01-294-10/+10
| |\ \ \ \
| | * | | | Update shoulda-matchersRobert Speicher2015-01-293-6/+6
| | * | | | Remove errant print statements from votes specRobert Speicher2015-01-291-4/+4
| | |/ / /
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-01-297-15/+47
|\ \ \ \ \
| * \ \ \ \ Merge branch 'improve-calendar-widget' into 'master'Dmitriy Zaporozhets2015-01-307-15/+47
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Use tile avatars for user/group show pagesDmitriy Zaporozhets2015-01-293-2/+6
| | * | | | Remove : from headersDmitriy Zaporozhets2015-01-292-3/+3
| | * | | | Improve contribution calendar on user pageDmitriy Zaporozhets2015-01-293-10/+38
* | | | | | Update changelog with version 7.7.2Dmitriy Zaporozhets2015-01-291-0/+4
|/ / / / /
* | | | | Merge pull request #8642 from fchasen/masterDmitriy Zaporozhets2015-01-291-1/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | use new hash syntaxFred Chasen2015-01-231-4/+4
| * | | | Split up line and use single qoutes to declare Cors settingsFred Chasen2015-01-231-1/+4