summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add "GitLab team members only" to diagram linkgitlab_architectureChris Wilson2016-06-281-1/+1
|
* Update GitLab architecture diagram, include Google draw linkChris Wilson2016-06-232-0/+2
| | | | [ci skip]
* Replace GitLab architecture diagramAchilleas Pipinellis2016-04-133-1/+1
| | | | [ci skip]
* Merge branch 'docs-new-branch-button-3886' into 'master' Achilleas Pipinellis2016-04-132-0/+32
|\ | | | | | | | | | | | | | | | | | | | | | | | | Docs for the new branch button [ci-skip] Closes #3886 @axil Could you check this and make sure this is up to your standards? See merge request !3425
| * Move 'New branch from issue' feature doc to web_editor.mdAchilleas Pipinellis2016-04-133-9/+32
| | | | | | | | [ci skip]
| * Docs for the new branch buttondocs-new-branch-button-3886Zeger-Jan van de Weg2016-03-282-0/+9
| | | | | | | | [ci-skip]
* | Merge branch 'fix-stale-branch-count-cache' into 'master' Yorick Peterse2016-04-133-0/+5
|\ \ | | | | | | | | | | | | Fix repository cache invalidation issue when project is recreated with an empty repo See merge request !3692
| * | Fix repository cache invalidation issue when project is recreated with an ↵Stan Hu2016-04-133-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | empty repo To reproduce: 1. Create a project with some content 2. Rename the project 3. Create a new project with the same name. 4. Boom - 404. After step 2, the branch and tag counts were not being cleared. This would cause `repository.has_visible_content?` to erroneously return `true` for the newly-created project. Closes #13384
* | | Merge branch 'api-group-visibility' into 'master' Rémy Coutable2016-04-134-2/+152
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | API: Ability to update a group This makes it much easier to update a group after introducing the group visibility. * Closes #14991 See merge request !3587
| * | Fix minor issues according development guidelinesRobert Schilling2016-04-123-11/+17
| | |
| * | API: Ability to update a groupRobert Schilling2016-04-124-2/+146
| | |
* | | Merge branch 'notes-input' into 'master' Jacob Schatz2016-04-123-5/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap text in notes box if longer than code in diff * Fixes branch name overflow * Text and inline `code` wraps in comments * `code` blocks scroll horizontally ![Screen_Shot_2016-04-11_at_4.59.15_PM](/uploads/39eee7d35ea79d1a3944aa6281b72121/Screen_Shot_2016-04-11_at_4.59.15_PM.png) See merge request !3626
| * | | Remove max-width from commentsnotes-inputAnnabel Dunstone2016-04-122-14/+0
| | | |
| * | | Input updatesAnnabel Dunstone2016-04-123-5/+49
| | | |
| * | | Wrap text in notes box if longer than code in diffAnnabel Dunstone2016-04-121-0/+1
| | | |
* | | | Merge branch 'fix-todo-target-path' into 'master' Robert Speicher2016-04-122-0/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix todo_target_path for todos where target was removed Fixes #15187 See merge request !3684
| * | | Fix todo_target_path for todos where target was removedfix-todo-target-pathDouglas Barbosa Alexandre2016-04-122-0/+4
|/ / /
* | | Merge branch 'rs-update-spring' into 'master' Robert Speicher2016-04-122-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update spring and spring-commands-spinach Spring changelog: https://git.io/vVAUY See merge request !3681
| * | | Update spring and spring-commands-spinachrs-update-springRobert Speicher2016-04-122-6/+6
| | | | | | | | | | | | | | | | Spring changelog: https://git.io/vVAUY
* | | | Merge branch 'issue_14206' into 'master' Jacob Schatz2016-04-126-7/+160
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix datetimes on tooltips Closes #14206 Updates tooltip datetimes on `.timeago()` instances. **Inline notes** ![Screen_Shot_2016-04-07_at_1.25.12_PM](/uploads/2f55390a7e91dabf75e71fe3bda91849/Screen_Shot_2016-04-07_at_1.25.12_PM.png) **Existing and new notes** ![Screen_Shot_2016-04-07_at_1.24.49_PM](/uploads/202bb7476738eb048f2d94abb68174e7/Screen_Shot_2016-04-07_at_1.24.49_PM.png) **Issuable dates** ![Screen_Shot_2016-04-07_at_1.24.32_PM](/uploads/80fd5cc3c06fade0b1c615bc7b7611a8/Screen_Shot_2016-04-07_at_1.24.32_PM.png) **Build dates** ![Screen_Shot_2016-04-07_at_1.25.02_PM](/uploads/832f43284005ea610a3ad54a49b97104/Screen_Shot_2016-04-07_at_1.25.02_PM.png) See merge request !3497
| * \ \ \ Merge branch 'master' into issue_14206issue_14206Alfredo Sumaran2016-04-11214-943/+2578
| |\ \ \ \
| * | | | | Rename method and initialize .timeago insideAlfredo Sumaran2016-04-114-19/+10
| | | | | |
| * | | | | Update datetime in .timeago elementsAlfredo Sumaran2016-04-073-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | This should be done before .timeago() is called on the element
| * | | | | Add datetime_utility.js.coffeeAlfredo Sumaran2016-04-071-0/+15
| | | | | |
| * | | | | Add date.format.jsAlfredo Sumaran2016-04-071-0/+125
| | | | | |
| * | | | | Convert time param to TimeAlfredo Sumaran2016-04-071-1/+1
| | | | | |
* | | | | | Merge branch 'check-import-job-status' into 'master' Robert Speicher2016-04-121-2/+8
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check and report import job status to help diagnose issues with forking There are no functional changes, but adding checks/logs for Sidekiq job IDs to help track down why many users seem to get stuck fork/import jobs. See merge request !3672
| * | | | | Check and report import job status to help diagnose issues with forkingStan Hu2016-04-111-2/+8
| | | | | |
* | | | | | Merge branch 'project-title-dropdown' into 'master' Jacob Schatz2016-04-1210-37/+82
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project dropdown in header uses new dropdown See merge request !3339
| * | | | | | Updated CHANGELOGPhil Hughes2016-04-121-9/+1
| | | | | | |
| * | | | | | Updated based on Ruby feedbackPhil Hughes2016-04-122-1/+9
| | | | | | |
| * | | | | | Updated RubyPhil Hughes2016-04-122-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added CHANGELOG item
| * | | | | | Updated based on Ruby feedbackPhil Hughes2016-04-123-19/+21
| | | | | | |
| * | | | | | Tests updatePhil Hughes2016-04-122-22/+24
| | | | | | |
| * | | | | | Updated testsPhil Hughes2016-04-123-4/+3
| | | | | | |
| * | | | | | Project dropdown in header uses new dropdownPhil Hughes2016-04-126-13/+51
| | | | | | |
* | | | | | | Merge branch 'fix_emojis_not_showing_in_autocomplete' into 'master' Robert Speicher2016-04-122-2/+2498
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix emoji aliases not showing in autocomplete closes #14948 See merge request !3595
| * | | | | | | fix emoji aliases not showing in autocompletefix_emojis_not_showing_in_autocompleteArinde Eniola2016-04-092-2/+2498
| | | | | | | |
* | | | | | | | Merge branch 'member-access-note-row' into 'master' Jacob Schatz2016-04-121-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with member access not being visible on notes This happened because the `note-actions`, which houses the access, was wrapped in a `can_edit` if statement ![Screen_Shot_2016-04-08_at_16.02.47](/uploads/40bffe9bb53c015f30ffa93bb018552b/Screen_Shot_2016-04-08_at_16.02.47.png) Fixes #15049 See merge request !3618
| * | | | | | | | Fixed issue with member access not being visible on notesmember-access-note-rowPhil Hughes2016-04-081-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #15049
* | | | | | | | | Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' Jacob Schatz2016-04-122-1/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix quick submit missing in edit merge request page closes #14953 ![fix](/uploads/5b80b37330929514c81299b4c8fe3efb/fix.gif) See merge request !3601
| * | | | | | | | | add some changes to the testfix_quick_submit_missing_in_edit_merge_requestArinde Eniola2016-04-071-11/+5
| | | | | | | | | |
| * | | | | | | | | add testArinde Eniola2016-04-071-0/+27
| | | | | | | | | |
| * | | | | | | | | fix quick submit missing in edit merge request pageArinde Eniola2016-04-071-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'admin-pages-layout-sass-update' into 'master' Jacob Schatz2016-04-121-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated media query for admin/groups search box @jschatz1 based on your comment https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3523#note_4632743 See merge request !3599
| * | | | | | | | | | Updated meqia query for admin/groups search boxadmin-pages-layout-sass-updatePhil Hughes2016-04-071-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'right-sidebar-link-hover' into 'master' Jacob Schatz2016-04-121-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed colour of dropdown link hover ![Screen_Shot_2016-04-07_at_16.02.40](/uploads/bfbfa5d1b82576b6bafaefd567effa06/Screen_Shot_2016-04-07_at_16.02.40.png) See merge request !3596
| * | | | | | | | | | Fixed colour of dropdown link hoverright-sidebar-link-hoverPhil Hughes2016-04-071-0/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fix_labels_not_showing_in_todos' into 'master' Jacob Schatz2016-04-123-1/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix labels not displayed on todos page closes #14512,#13920 # For Todos ## Before ![Screen_Shot_2016-03-23_at_8.59.32_PM](/uploads/0c22c7674783031c9be842860082fdc2/Screen_Shot_2016-03-23_at_8.59.32_PM.png) ## After ![Screen_Shot_2016-03-24_at_12.35.06_PM](/uploads/f62d3f39c0aa2f7079368e157a3a558c/Screen_Shot_2016-03-24_at_12.35.06_PM.png) # For Activity Feed ## Before ![Screen_Shot_2016-03-24_at_12.37.41_PM](/uploads/744370db7a4bd3782c029d80c3694ee7/Screen_Shot_2016-03-24_at_12.37.41_PM.png) ## After ![Screen_Shot_2016-03-24_at_12.37.00_PM](/uploads/9939817c14e98b50b3e16c8b7b9cf009/Screen_Shot_2016-03-24_at_12.37.00_PM.png) See merge request !3371
| * | | | | | | | | | fix labels not showing on todos pagefix_labels_not_showing_in_todosArinde Eniola2016-04-063-1/+16
| | | | | | | | | | |