summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add brakeman rake task and improve code securityDmitriy Zaporozhets2015-03-024-14/+39
* Merge branch 'cirosantilli-link-to-button' into 'master'Dmitriy Zaporozhets2015-03-039-13/+14
|\
| * Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq int...Dmitriy Zaporozhets2015-03-029-13/+14
| |\
| | * Convert Javascript links to buttons.Ciro Santilli2015-01-179-13/+14
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-021-1/+1
|\ \ \
| * \ \ Merge pull request #8092 from cirosantilli/factor-finder-permsDmitriy Zaporozhets2015-03-021-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Factor permission check in issuable finderCiro Santilli2015-01-011-1/+1
* | | | Merge branch 'less-sql-queries' into 'master'Dmitriy Zaporozhets2015-03-022-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Reduce amount of sql queries on dashboard projects pageDmitriy Zaporozhets2015-03-022-2/+2
* | | | Merge pull request #8812 from opichals/teamcity_branchName_not_to_be_whole_refDmitriy Zaporozhets2015-03-021-2/+2
|\ \ \ \
| * | | | Fix for TeamCity buildQueue REST API build/@branchName.Standa Opichal2015-02-191-2/+2
* | | | | Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into A...Dmitriy Zaporozhets2015-03-025-2/+326
|\ \ \ \ \
| * | | | | Add Irker serviceAorimn2015-03-015-2/+326
* | | | | | Merge pull request #7473 from sodabrew/patch-1Dmitriy Zaporozhets2015-03-023-18/+24
|\ \ \ \ \ \
| * | | | | | Improve login screen when only OmniAuth providers are enabledAaron Stone2015-02-133-18/+24
* | | | | | | Merge pull request #8501 from AKoetsier/slack_channel_and_usernameDmitriy Zaporozhets2015-03-022-4/+11
|\ \ \ \ \ \ \
| * | | | | | | Allow a user to specify a channel and username for the slack-webhookAndrès Koetsier2015-02-282-4/+11
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-021-0/+16
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix-protected-branches-routing' into 'master'Dmitriy Zaporozhets2015-03-021-0/+16
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Fix broken `project_url` routing when protected branches are accessed with an...Stan Hu2015-03-011-0/+16
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge pull request #8829 from ZeoAlliance/merge_request_diff_view_fixDmitriy Zaporozhets2015-03-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Removed exceeding semicolonkrolik2015-02-201-1/+1
| * | | | | | | Fixed merge request diff page after back browser button is pressed.krolik2015-02-201-1/+1
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-024-6/+14
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #8890 from sue445/feature/project_api_avatar_urlJeroen van Baarsen2015-03-012-4/+12
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Expose avatar_url in projects APIsue4452015-03-012-4/+12
| * | | | | | | Merge pull request #8882 from Shine-neko/masterRobert Schilling2015-02-282-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | fix typoMlanawo Mbechezi2015-02-272-2/+2
* | | | | | | | | Merge branch 'create_issue_header' into 'master'Marin Jankovski2015-03-021-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Changed to "Create Issue"Sabba Petri2015-02-271-1/+1
| * | | | | | | | Changed header to Create New IssueSabba Petri2015-02-271-1/+1
* | | | | | | | | Merge branch 'update_update_project_milestone_path' into 'master'Dmitriy Zaporozhets2015-02-271-1/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Update project_milestone_path update route.Marin Jankovski2015-02-261-1/+2
| |/ / / / / / /
* | | | | | | | Fix and test User#contributed_projects_ids.Douwe Maan2015-02-271-0/+1
* | | | | | | | Merge branch 'autocomplete-mention-count' into 'master'Dmitriy Zaporozhets2015-02-271-3/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Include number of affected people in all/group mention autocomplete item.Douwe Maan2015-02-251-3/+9
* | | | | | | | | Merge branch 'route-helper' into 'master'Dmitriy Zaporozhets2015-02-2726-49/+77
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix syntax issueDmitriy Zaporozhets2015-02-261-1/+1
| * | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into route-helperDmitriy Zaporozhets2015-02-267-14/+19
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Include route helper shortcut in controllerDmitriy Zaporozhets2015-02-261-0/+1
| * | | | | | | | | More use of shortcut routesDmitriy Zaporozhets2015-02-254-10/+6
| * | | | | | | | | Add explanation to routing methodDmitriy Zaporozhets2015-02-251-0/+13
| * | | | | | | | | Introduce shortcuts for routing helpersDmitriy Zaporozhets2015-02-2521-39/+57
* | | | | | | | | | Merge branch 'filter_icons_btn' into 'master'Marin Jankovski2015-02-261-2/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added a margin and a couple stylesSabba Petri2015-02-242-3/+9
| * | | | | | | | | | Filter icons look like proper buttonsSabba Petri2015-02-231-1/+1
* | | | | | | | | | | Merge branch 'small_profile_changes' into 'master'Marin Jankovski2015-02-2610-24/+25
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into small_profile_ch...Sabba Petri2015-02-2417-29/+62
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixes grammatical consistency and small changesSabba Petri2015-02-2310-24/+25
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'event_tooltip_addition' into 'master'Marin Jankovski2015-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status