summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix search in Filesfix_search_in_file_treeValery Sizov2015-10-052-1/+5
* Merge branch 'revert-layout-changes' into 'master' Dmitriy Zaporozhets2015-10-055-36/+4
|\
| * Revert "Merge branch 'projects' into 'master' "revert-layout-changesDmitriy Zaporozhets2015-10-055-36/+4
* | Update ci to ce doc to make it clearer when you are done if you don't want to...Marin Jankovski2015-10-051-2/+4
* | Evaluate benchmark blocks in the proper contextYorick Peterse2015-10-051-1/+3
* | Merge branch 'ci-web-hooks'Dmitriy Zaporozhets2015-10-058-69/+88
|\ \
| * | CI web hooks menu active state and consitent titleci-web-hooksDmitriy Zaporozhets2015-10-052-2/+2
| * | Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-058-68/+87
| |/
* | Merge branch 'benchmark-suite' into 'master' Yorick Peterse2015-10-058-4/+193
|\ \
| * | Added documentation for writing benchmarksYorick Peterse2015-10-052-0/+70
| * | Allow benchmark failures for the time beingYorick Peterse2015-10-051-0/+1
| * | Added benchmark_subject method for benchmarksYorick Peterse2015-10-052-4/+21
| * | Basic setup for an RSpec based benchmark suitebenchmark-suiteYorick Peterse2015-10-025-2/+101
| * | Don't use "rm" for cleaning tmp/buildsYorick Peterse2015-10-021-2/+4
* | | Merge branch 'fix_scroll_on_diff_tab' into 'master' Dmitriy Zaporozhets2015-10-052-0/+8
|\ \ \
| * | | Fix anchors to comments in diffsValery Sizov2015-10-052-0/+8
| | |/ | |/|
* | | Merge branch 'golang-i386' into 'master' Achilleas Pipinellis2015-10-051-0/+3
|\ \ \ | |/ / |/| |
| * | Golang download instructions assume amd64golang-i386Jacob Vosmaer2015-10-011-0/+3
* | | Merge pull request #9673 from fscherwi/patch-1Dmitriy Zaporozhets2015-10-041-1/+1
|\ \ \
| * | | change build status image to svg [ci skip]fscherwi2015-09-271-1/+1
* | | | Merge pull request #9690 from ggarnier/masterDmitriy Zaporozhets2015-10-0441-113/+85
|\ \ \ \
| * | | | Fix rubocop warnings in featuresGuilherme Garnier2015-10-036-35/+33
| * | | | Fix rubocop warnings in spec/lib and spec/tasksGuilherme Garnier2015-10-033-7/+3
| * | | | Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-0339-238/+237
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'fix-cache-key-expiration-for-commits' into 'master' Dmitriy Zaporozhets2015-10-034-4/+5
|\ \ \ \ \
| * | | | | Update README cache key to use full project namespaceStan Hu2015-10-022-3/+3
| * | | | | Fix bug where transferring a project would result in stale commit linksStan Hu2015-10-022-1/+2
* | | | | | Merge branch 'projects' into 'master' Dmitriy Zaporozhets2015-10-035-4/+36
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | removed max-heght from project.scssprojectsAndrey2015-10-021-6/+0
| * | | | | max height to layout.scssAndrey2015-10-021-0/+6
| * | | | | section and .content now in layout.csscAndrey2015-10-022-11/+10
| * | | | | CSS markup fixedAndrey2015-10-025-38/+30
| * | | | | css aligningAndrey2015-10-011-1/+0
| * | | | | content block height fixAndrey2015-10-012-3/+45
* | | | | | Merge remote-tracking branch 'public/hide_services_password'Dmitriy Zaporozhets2015-10-025-3/+14
|\ \ \ \ \ \
| * | | | | | Hide password in the service settings formhide_services_passwordValery Sizov2015-10-025-3/+14
* | | | | | | Merge branch 'access_level_badge_bug' into 'master' Dmitriy Zaporozhets2015-10-024-3/+20
|\ \ \ \ \ \ \
| * | | | | | | Wrong access level badge on MR commentsaccess_level_badge_bugValery Sizov2015-10-024-3/+20
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-027-101/+125
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Conform to spec guidelines that only exist in my headrs-throttle-resetRobert Speicher2015-10-021-1/+1
| * | | | | | Fix spec broken by updated Devise translationsRobert Speicher2015-10-011-1/+1
| * | | | | | Refactor PasswordsController to use before_actionsRobert Speicher2015-10-012-22/+22
| * | | | | | Add recently_reset message to Devise translationsRobert Speicher2015-10-011-0/+1
| * | | | | | Add User#recently_sent_password_reset?Robert Speicher2015-10-012-0/+24
| * | | | | | Update config/locales/devise.en.yml with latest versionRobert Speicher2015-10-011-51/+52
| * | | | | | Remove specs for "login after reset"Robert Speicher2015-09-301-40/+0
| * | | | | | Update feature specRobert Speicher2015-09-301-0/+1
| * | | | | | Autofocus the email field on the password reset formRobert Speicher2015-09-301-1/+1
| * | | | | | Only allow password reset emails once per minuteRobert Speicher2015-09-302-14/+51
* | | | | | | Merge branch 'migration-doc-fix' into 'master' Jacob Vosmaer2015-10-021-1/+8
|\ \ \ \ \ \ \