summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CI web hooks menu active state and consitent titleci-web-hooksDmitriy Zaporozhets2015-10-052-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-058-68/+87
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #9673 from fscherwi/patch-1Dmitriy Zaporozhets2015-10-041-1/+1
|\ | | | | change build status image to svg
| * 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 "useless assignment" Rubocop warnings
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where transferring a project would result in stale commit links Transferring a project to another namespace updates the project's updated_at field, but since the cache key did not depend on the object, the page fragments were not invalidated. This resulted in stale links to the commits. Changing the cache key to use the project pathname solves this issue. Closes gitlab-org/omnibus-gitlab#843 See merge request !1497
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transferring a project to another namespace updates the project's updated_at field, but since the cache key did not depend on the object, the page fragments were not invalidated. This resulted in stale links to the commits. Changing the cache key to use the object pathname solves this issue. Closes gitlab-org/omnibus-gitlab#843
* | | | Merge branch 'projects' into 'master' Dmitriy Zaporozhets2015-10-035-4/+36
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project page height old thing. Grey block not aligned to the bottom. It was a scroll even with short project description. ![Screen_Shot_2015-10-01_at_16.03.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b412eeaa40c79861191d1a432d95951d/Screen_Shot_2015-10-01_at_16.03.24.png) New awesome stuff, no scroll, grey block aligned to the bottom. ![Screen_Shot_2015-10-01_at_16.04.08](https://gitlab.com/gitlab-org/gitlab-ce/uploads/823cdb6bfb8caec892ed001448f731e5/Screen_Shot_2015-10-01_at_16.04.08.png) See merge request !1487
| * | | 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
| | | | | | | | | | | | | | | | | | | | Everything is fixed according DZ comments. Added a bit sexy transition for our project buttons ><
| * | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Wrong access level badge on MR comments https://gitlab.com/gitlab-org/gitlab-ce/issues/2654 See merge request !1501
| * | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throttle "Forgot your password?" emails Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611 See merge request !1476
| * | | | | Conform to spec guidelines that only exist in my headrs-throttle-resetRobert Speicher2015-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like a lot of changes but it's not, they just sorted it alphabetically.
| * | | | | Remove specs for "login after reset"Robert Speicher2015-09-301-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | We're now using default Devise behavior, so these tests were redundant.
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611
* | | | | | Merge branch 'migration-doc-fix' into 'master' Jacob Vosmaer2015-10-021-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back and forth permission on builds/ @jacobvosmaer I missed that :( See merge request !1500
| * | | | | | Back and forth permission on builds/migration-doc-fixKamil Trzcinski2015-10-021-1/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ensure-ci-project' into 'master' Dmitriy Zaporozhets2015-10-0211-122/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure GitLab CI project exists when CI service is activated manually When I check activeated checkbox in project services for GitLab CI it cause half-working state when gitlab_ci_project is missing. This patch fixes it until we have proper behaviour implemented later This fix also bring us to the point when fork of project is a bit broken and have unnecessary code so I made cleanup. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @ayufan See merge request !1491
| * | | | | Fix testsDmitriy Zaporozhets2015-10-022-29/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Remove unnecessary fork ci logicDmitriy Zaporozhets2015-10-025-84/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Prevent creating 2 Ci::Project entities when enable CIDmitriy Zaporozhets2015-10-025-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Ensure GitLab CI project exists when CI service is activated manuallyensure-ci-projectDmitriy Zaporozhets2015-10-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I check activeated checkbox in project services for GitLab CI it cause half-working state when gitlab_ci_project is missing. This patch fixes it until we have proper behaviour implemented later Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Added benchmark-ips to the GemfileYorick Peterse2015-10-022-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows me to use this Gem for benchmarking without having to add/remove it every time.
* | | | | | Merge branch 'add_last_push_widget' into 'master' Dmitriy Zaporozhets2015-10-022-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add last push widget to starred projects dashboard This adds the last push widget to the starred projects dashboard. If a user set the starred projects dashboard as their preferred dashboard they would not see last push widget. The look is seamless between starred and 'your projects' dashboards. ### Screenshot: ![Screen_Shot_2015-10-01_at_3.15.52_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2f5dcf49c3d0186bdd05bb6788b143f1/Screen_Shot_2015-10-01_at_3.15.52_PM.png) See merge request !1304
| * | | | | | Add last push widget to starred projects dashboardDrew Blessing2015-10-012-0/+4
| | | | | | |
| | | | | * | Fix rubocop warnings in spec/modelsGuilherme Garnier2015-10-0311-19/+14
| | | | | | |
| | | | | * | Fix rubocop warnings in libGuilherme Garnier2015-10-036-9/+5
| | | | | | |
| | | | | * | Fix rubocop warnings in appGuilherme Garnier2015-10-0314-42/+29
| | | | | | |
| | | | | * | Enable "UselessAssignment" rubocop lintGuilherme Garnier2015-10-031-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2015-10-013-3/+38
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'upgrade-version' into 'master' Patricio Cano2015-10-011-3/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to rake tasks I believe there should be a link to rake tasks from backup restore, to give the user more options. That is why I added the link in the documentation. Because of tweet https://twitter.com/gordonjb/status/641252693701476352 See merge request !1928
| | * \ \ \ \ \ solved conflictkaren Carias2015-09-30757-2068/+21025
| | |\ \ \ \ \ \
View Lorry Controller Status