summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove now unnecessary satelittes logic for creating and editing file with we...web-editor-ruggedDmitriy Zaporozhets2015-06-023-143/+0
* Create activity event and execute hooks on web editor commitDmitriy Zaporozhets2015-06-023-3/+11
* Remove file api tests which depend on old satellite logicDmitriy Zaporozhets2015-06-021-32/+3
* Use rugged in web editor for base64 encodingDmitriy Zaporozhets2015-06-012-34/+28
* Allow base64 for edit blobsDmitriy Zaporozhets2015-06-011-2/+2
* Fix adding new file to empty repoDmitriy Zaporozhets2015-06-013-4/+4
* Create and edit files in web editor via ruggedDmitriy Zaporozhets2015-06-015-17/+62
* Merge branch 'refactor-header' into 'master'Dmitriy Zaporozhets2015-06-0115-200/+169
|\
| * improve navbar collapse for mobile viewsDmitriy Zaporozhets2015-06-013-13/+10
| * Fix header overflow for big titleDmitriy Zaporozhets2015-06-012-23/+6
| * Refactor header viewsDmitriy Zaporozhets2015-06-017-27/+18
| * More fixes to header cssDmitriy Zaporozhets2015-06-016-9/+7
| * Refactor header css/htmlrefactor-headerDmitriy Zaporozhets2015-06-017-153/+153
|/
* Merge branch 'linguist-comment' into 'master'Dmitriy Zaporozhets2015-06-011-0/+8
|\
| * Add comments about gitlab forksDmitriy Zaporozhets2015-06-011-1/+5
| * Exmplain gitlab-linguist fork existenceDmitriy Zaporozhets2015-06-011-0/+4
|/
* Better margin for header in accept MR widgetDmitriy Zaporozhets2015-06-011-1/+1
* Show avatars in merge widget and fix mr download button overflowDmitriy Zaporozhets2015-06-012-11/+10
* Merge branch 'disable-mr-source-branch-change' into 'master'Dmitriy Zaporozhets2015-06-015-8/+12
|\
| * Disable changing of the source branch in merge request update APIStan Hu2015-05-295-8/+12
* | Merge branch 'feature/sign_out_page' into 'master'Dmitriy Zaporozhets2015-06-017-2/+20
|\ \
| * | Allow to configure a URL to show after sign outAlex Lossent2015-05-297-2/+20
* | | Improve UI for accept MR widgetDmitriy Zaporozhets2015-06-011-13/+7
* | | Merge branch 'master' into 'master'Robert Schilling2015-05-311-1/+1
|\ \ \
| * | | small typoTerrence Benade2015-05-311-1/+1
|/ / /
* | | Merge branch 'fix/saml_changelog' into 'master'Robert Schilling2015-05-291-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix misplaced changelog entry for SAML supportAlex Lossent2015-05-291-1/+1
| |/
* | Improve UI of project sidebarDmitriy Zaporozhets2015-05-293-9/+14
|/
* Merge branch 'leave-project' into 'master'Dmitriy Zaporozhets2015-05-296-4/+35
|\
| * Make leave buttons more explicitleave-projectDmitriy Zaporozhets2015-05-292-3/+5
| * Add changelog item about leave project featureDmitriy Zaporozhets2015-05-291-0/+1
| * Add ability to leave projectDmitriy Zaporozhets2015-05-293-1/+29
* | Merge branch 'support-edit-target-branch-in-mr' into 'master'Dmitriy Zaporozhets2015-05-2911-5/+104
|\ \
| * | Support editing target branch of merge requestStan Hu2015-05-2911-5/+104
* | | Merge branch 'user-oauth-applications' into 'master'Dmitriy Zaporozhets2015-05-299-29/+63
|\ \ \
| * | | Add option to disallow users from registering any application to use GitLab a...user-oauth-applicationsDouwe Maan2015-05-299-29/+63
* | | | Merge branch 'leave-group' into 'master'Dmitriy Zaporozhets2015-05-295-6/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix tests for group leave featureDmitriy Zaporozhets2015-05-292-1/+6
| * | | User should be able to leave group. If not - show him proper messageDmitriy Zaporozhets2015-05-293-5/+9
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-298-4/+109
|\ \ \ \
| * \ \ \ Merge branch 'mr-wip-text' into 'master'Dmitriy Zaporozhets2015-05-292-4/+5
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Shorten merge request WIP text.Douwe Maan2015-05-292-4/+5
| * | | | Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-297-0/+104
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add SAML support via OmniauthAlex Lossent2015-05-277-0/+104
* | | | | Style header search field on focusDmitriy Zaporozhets2015-05-291-0/+7
|/ / / /
* | | | Merge branch 'rs-merge-request-tabs-the-third' into 'master'Dmitriy Zaporozhets2015-05-291-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Include location.search and location.hash in URL for replaceStateRobert Speicher2015-05-291-0/+3
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-2923-547/+313
|\ \ \ \
| * \ \ \ Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets2015-05-2923-547/+313
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Disable Rack::MiniProfiler for /teaspoon pathrs-teaspoonRobert Speicher2015-05-281-1/+2