Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-edit-note-with-votes' into 'master' | Marin Jankovski | 2015-03-03 | 4 | -5/+12 |
|\ | |||||
| * | Fix bug where editing a comment with "+1" or "-1" would cause a server error | Stan Hu | 2015-03-02 | 4 | -5/+12 |
* | | Merge branch 'go-import' into 'master' | Marin Jankovski | 2015-03-03 | 2 | -0/+16 |
|\ \ | |||||
| * | | Render go-import meta tag for private repos. | Douwe Maan | 2015-03-03 | 3 | -7/+16 |
| * | | Revert "Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/g... | Douwe Maan | 2015-03-03 | 1 | -0/+7 |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2015-03-03 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Count commits in branches as well in the commit calendar | Hannes Rosenögger | 2015-03-03 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'user-select-unassigned' into 'master' | Dmitriy Zaporozhets | 2015-03-03 | 1 | -8/+9 |
|\ \ \ | |||||
| * | | | Don't show Unassigned in user select when searching. | Douwe Maan | 2015-03-03 | 1 | -8/+9 |
| |/ / | |||||
* | | | Fix import check for case sensetive namespaces | Dmitriy Zaporozhets | 2015-03-02 | 2 | -1/+6 |
|/ / | |||||
* | | Add brakeman rake task and improve code security | Dmitriy Zaporozhets | 2015-03-02 | 4 | -14/+39 |
* | | Merge branch 'cirosantilli-link-to-button' into 'master' | Dmitriy Zaporozhets | 2015-03-03 | 9 | -13/+14 |
|\ \ | |||||
| * \ | Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq int... | Dmitriy Zaporozhets | 2015-03-02 | 9 | -13/+14 |
| |\ \ | |||||
| | * | | Convert Javascript links to buttons. | Ciro Santilli | 2015-01-17 | 9 | -13/+14 |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-03-02 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #8092 from cirosantilli/factor-finder-perms | Dmitriy Zaporozhets | 2015-03-02 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Factor permission check in issuable finder | Ciro Santilli | 2015-01-01 | 1 | -1/+1 |
* | | | | | Merge branch 'less-sql-queries' into 'master' | Dmitriy Zaporozhets | 2015-03-02 | 2 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Reduce amount of sql queries on dashboard projects page | Dmitriy Zaporozhets | 2015-03-02 | 2 | -2/+2 |
* | | | | | Merge pull request #8812 from opichals/teamcity_branchName_not_to_be_whole_ref | Dmitriy Zaporozhets | 2015-03-02 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix for TeamCity buildQueue REST API build/@branchName. | Standa Opichal | 2015-02-19 | 1 | -2/+2 |
* | | | | | | Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into A... | Dmitriy Zaporozhets | 2015-03-02 | 5 | -2/+326 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add Irker service | Aorimn | 2015-03-01 | 5 | -2/+326 |
* | | | | | | | Merge pull request #7473 from sodabrew/patch-1 | Dmitriy Zaporozhets | 2015-03-02 | 3 | -18/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Improve login screen when only OmniAuth providers are enabled | Aaron Stone | 2015-02-13 | 3 | -18/+24 |
* | | | | | | | | Merge pull request #8501 from AKoetsier/slack_channel_and_username | Dmitriy Zaporozhets | 2015-03-02 | 2 | -4/+11 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Allow a user to specify a channel and username for the slack-webhook | Andrès Koetsier | 2015-02-28 | 2 | -4/+11 |
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-03-02 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'fix-protected-branches-routing' into 'master' | Dmitriy Zaporozhets | 2015-03-02 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | * | | | | | | | Fix broken `project_url` routing when protected branches are accessed with an... | Stan Hu | 2015-03-01 | 1 | -0/+16 |
| | | |_|/ / / / | | |/| | | | | | |||||
* | | | | | | | | Merge pull request #8829 from ZeoAlliance/merge_request_diff_view_fix | Dmitriy Zaporozhets | 2015-03-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Removed exceeding semicolon | krolik | 2015-02-20 | 1 | -1/+1 |
| * | | | | | | | Fixed merge request diff page after back browser button is pressed. | krolik | 2015-02-20 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-03-02 | 4 | -6/+14 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #8890 from sue445/feature/project_api_avatar_url | Jeroen van Baarsen | 2015-03-01 | 2 | -4/+12 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Expose avatar_url in projects API | sue445 | 2015-03-01 | 2 | -4/+12 |
| * | | | | | | | Merge pull request #8882 from Shine-neko/master | Robert Schilling | 2015-02-28 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | fix typo | Mlanawo Mbechezi | 2015-02-27 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'create_issue_header' into 'master' | Marin Jankovski | 2015-03-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Changed to "Create Issue" | Sabba Petri | 2015-02-27 | 1 | -1/+1 |
| * | | | | | | | | Changed header to Create New Issue | Sabba Petri | 2015-02-27 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'update_update_project_milestone_path' into 'master' | Dmitriy Zaporozhets | 2015-02-27 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Update project_milestone_path update route. | Marin Jankovski | 2015-02-26 | 1 | -1/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Fix and test User#contributed_projects_ids. | Douwe Maan | 2015-02-27 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'autocomplete-mention-count' into 'master' | Dmitriy Zaporozhets | 2015-02-27 | 1 | -3/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Include number of affected people in all/group mention autocomplete item. | Douwe Maan | 2015-02-25 | 1 | -3/+9 |
* | | | | | | | | | Merge branch 'route-helper' into 'master' | Dmitriy Zaporozhets | 2015-02-27 | 26 | -49/+77 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix syntax issue | Dmitriy Zaporozhets | 2015-02-26 | 1 | -1/+1 |
| * | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into route-helper | Dmitriy Zaporozhets | 2015-02-26 | 7 | -14/+19 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Include route helper shortcut in controller | Dmitriy Zaporozhets | 2015-02-26 | 1 | -0/+1 |